diff --git a/server/cros/tradefed/generate_controlfiles_CTS_P.py b/server/cros/tradefed/generate_controlfiles_CTS_P.py
index 6c92a50..6c8c2b5 100755
--- a/server/cros/tradefed/generate_controlfiles_CTS_P.py
+++ b/server/cros/tradefed/generate_controlfiles_CTS_P.py
@@ -180,6 +180,13 @@
 
 CONFIG['NEEDS_PUSH_MEDIA'] = CONFIG['MEDIA_MODULES']
 
+# See b/149889853. Non-media test basically does not require dynamic
+# config. To reduce the flakiness, let us suppress the config.
+CONFIG['NEEDS_DYNAMIC_CONFIG_ON_COLLECTION'] = False
+CONFIG['NEEDS_DYNAMIC_CONFIG'] = CONFIG['MEDIA_MODULES'] + [
+    'CtsIntentSignatureTestCases'
+]
+
 # Modules that are known to need the default apps of Chrome (eg. Files.app).
 CONFIG['ENABLE_DEFAULT_APPS'] = [
     'CtsAppSecurityHostTestCases',
diff --git a/server/cros/tradefed/generate_controlfiles_common.py b/server/cros/tradefed/generate_controlfiles_common.py
index 25c1c03..da27d58 100755
--- a/server/cros/tradefed/generate_controlfiles_common.py
+++ b/server/cros/tradefed/generate_controlfiles_common.py
@@ -534,6 +534,8 @@
     for m in CONFIG['MEDIA_MODULES']:
         cmd.append('--module-arg')
         cmd.append('%s:skip-media-download:true' % m)
+    if not CONFIG.get('NEEDS_DYNAMIC_CONFIG_ON_COLLECTION', True):
+        cmd.append('--dynamic-config-url=')
     return cmd
 
 
@@ -588,6 +590,11 @@
         not (modules.intersection(CONFIG['BVT_ARC'] + CONFIG['SMOKE'] +
              CONFIG['NEEDS_DEVICE_INFO']))):
         cmd.append('--skip-device-info')
+    # If NEEDS_DYNAMIC_CONFIG is set, disable the feature except on the modules
+    # that explicitly set as needed.
+    if (CONFIG.get('NEEDS_DYNAMIC_CONFIG') and
+            not modules.intersection(CONFIG['NEEDS_DYNAMIC_CONFIG'])):
+        cmd.append('--dynamic-config-url=')
 
     return cmd
 
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 eb8db0b..74c0090 100644
--- a/server/site_tests/cheets_CTS_P/cheets_CTS_P.py
+++ b/server/site_tests/cheets_CTS_P/cheets_CTS_P.py
@@ -48,13 +48,11 @@
         cmd = []
         for arg in template:
             cmd.append(arg.format(session_id=session_id))
-        cmd += self.extra_command_flags
         return cmd
 
     def _tradefed_run_command(self, template):
         """Build tradefed 'run' command from template."""
         cmd = template[:]
-        cmd += self.extra_command_flags
         # If we are running outside of the lab we can collect more data.
         if not utils.is_in_container():
             logging.info('Running outside of lab, adding extra debug options.')
@@ -179,10 +177,6 @@
         @param prerequisites: a list of prerequisites that identify rogue DUTs.
         @param timeout: time after which tradefed can be interrupted.
         """
-        # See b/149889853. Non-media test basically does not require dynamic
-        # config. To reduce the flakiness, let us suppress the config.
-        if not needs_push_media:
-            self.extra_command_flags.append('--dynamic-config-url=')
         self._run_tradefed_with_retries(
             test_name=test_name,
             run_template=run_template,
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAbiOverrideHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAbiOverrideHostTestCases
index dbac881..a2f0e65 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAbiOverrideHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAbiOverrideHostTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsAbiOverrideHostTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsAbiOverrideHostTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAbiOverrideHostTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAccessibility b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAccessibility
index 568bdfa..5ece6c7 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAccessibility
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAccessibility
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsAccessibility',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsAccessibility',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAccessibilityServiceTestCases', '--include-filter', 'CtsAccessibilityTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAccountManagerTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAccountManagerTestCases
index 52d47a5..19f1616 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAccountManagerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAccountManagerTestCases
@@ -23,8 +23,8 @@
         max_retry=3,
         tag='9.0_r11.arm.CtsAccountManagerTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsAccountManagerTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAccountManagerTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsActivityManagerDevice b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsActivityManagerDevice
index 64bb59a..33faaa5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsActivityManagerDevice
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsActivityManagerDevice
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsActivityManagerDevice',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsActivityManagerDevice',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsActivityManagerDeviceSdk25TestCases', '--include-filter', 'CtsActivityManagerDeviceTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAdmin b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAdmin
index 80e1c65..f1adf0f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAdmin
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAdmin
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsAdmin',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsAdmin',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAdminPackageInstallerTestCases', '--include-filter', 'CtsAdminTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAlarm b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAlarm
index 4ffef87..cc6093a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAlarm
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAlarm
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsAlarm',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsAlarm',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAlarmClockTestCases', '--include-filter', 'CtsAlarmManagerTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAndroid b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAndroid
index 6bf96da..12c1b8b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAndroid
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAndroid
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsAndroid',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsAndroid',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAndroidAppTestCases', '--include-filter', 'CtsAndroidTestBase27ApiSignatureTestCases', '--include-filter', 'CtsAndroidTestMockCurrentApiSignatureTestCases', '--include-filter', 'CtsAndroidTestRunnerCurrentApiSignatureTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAnimationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAnimationTestCases
index 67556bb..0e662b9 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAnimationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAnimationTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsAnimationTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsAnimationTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAnimationTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsApacheHttpLegacy b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsApacheHttpLegacy
index 8afd5ac..74ab98d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsApacheHttpLegacy
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsApacheHttpLegacy
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsApacheHttpLegacy',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsApacheHttpLegacy',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsApacheHttpLegacy27ApiSignatureTestCases', '--include-filter', 'CtsApacheHttpLegacyCurrentApiSignatureTestCases', '--include-filter', 'CtsApacheHttpLegacyUsesLibraryApiSignatureTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsApp b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsApp
index d26da6d..a5ab25c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsApp
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsApp
@@ -23,8 +23,8 @@
         enable_default_apps=True,
         tag='9.0_r11.arm.CtsApp',
         test_name='cheets_CTS_P.9.0_r11.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'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAslrMallocTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAslrMallocTestCases
index 5efe4ab..130aab7 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAslrMallocTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAslrMallocTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsAslrMallocTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsAslrMallocTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAslrMallocTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAssistTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAssistTestCases
index 1d0dc42..fd5dff2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAssistTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAssistTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsAssistTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsAssistTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAssistTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAtraceHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAtraceHostTestCases
index 146a19a..165ed9c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAtraceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAtraceHostTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsAtraceHostTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsAtraceHostTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAtraceHostTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAutoFillServiceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAutoFillServiceTestCases
index d4140ae..b77d14d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAutoFillServiceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAutoFillServiceTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsAutoFillServiceTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsAutoFillServiceTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAutoFillServiceTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsBackgroundRestrictionsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsBackgroundRestrictionsTestCases
index f362f51..593a722 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsBackgroundRestrictionsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsBackgroundRestrictionsTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsBackgroundRestrictionsTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsBackgroundRestrictionsTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsBackgroundRestrictionsTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsBackup b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsBackup
index 2d5d207..3a562f0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsBackup
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsBackup
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsBackup',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsBackup',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsBackupHostTestCases', '--include-filter', 'CtsBackupTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsBatterySavingTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsBatterySavingTestCases
index 1728e1b..61b0df0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsBatterySavingTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsBatterySavingTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsBatterySavingTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsBatterySavingTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsBatterySavingTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsBionicTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsBionicTestCases
index 66400ec..71492bd 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsBionicTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsBionicTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsBionicTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsBionicTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsBionicTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsBluetoothTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsBluetoothTestCases
index 039c8f6..734e92f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsBluetoothTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsBluetoothTestCases
@@ -35,8 +35,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsBluetoothTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsBluetoothTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsBluetoothTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsBootStatsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsBootStatsTestCases
index c2d912d..e0a2350 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsBootStatsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsBootStatsTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsBootStatsTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsBootStatsTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsBootStatsTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCalendarcommon2TestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCalendarcommon2TestCases
index 0469c72..a739de3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCalendarcommon2TestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCalendarcommon2TestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsCalendarcommon2TestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsCalendarcommon2TestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCalendarcommon2TestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCamera b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCamera
index c83591d..403ce4f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCamera
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCamera
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsCamera',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsCamera',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraApi25TestCases', '--include-filter', 'CtsCameraTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCameraTestCases.camerabox.back b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCameraTestCases.camerabox.back
index f64d16b..655e15a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCameraTestCases.camerabox.back
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCameraTestCases.camerabox.back
@@ -24,8 +24,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsCameraTestCases.camerabox.back',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsCameraTestCases.camerabox.back',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCameraTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCameraTestCases.camerabox.front b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCameraTestCases.camerabox.front
index 814cefd..687da46 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCameraTestCases.camerabox.front
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCameraTestCases.camerabox.front
@@ -24,8 +24,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsCameraTestCases.camerabox.front',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsCameraTestCases.camerabox.front',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCameraTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCarTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCarTestCases
index 1b5d6d4..9ff94e3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCarTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCarTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsCarTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsCarTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCarTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCarrierApiTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCarrierApiTestCases
index f0f144c..842a9e0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCarrierApiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCarrierApiTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsCarrierApiTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsCarrierApiTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCarrierApiTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsColorModeTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsColorModeTestCases
index a78aaf6..59cab39 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsColorModeTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsColorModeTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsColorModeTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsColorModeTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsColorModeTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCompilationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCompilationTestCases
index 78cbdd4..f987fe9 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCompilationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCompilationTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsCompilationTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsCompilationTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCompilationTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsContactsProviderWipe b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsContactsProviderWipe
index f72d088..3553d49 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsContactsProviderWipe
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsContactsProviderWipe
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsContactsProviderWipe',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsContactsProviderWipe',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsContactsProviderWipe', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsContentTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsContentTestCases
index d777eab..2c7549c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsContentTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsContentTestCases
@@ -23,8 +23,8 @@
         enable_default_apps=True,
         tag='9.0_r11.arm.CtsContentTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsContentTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsContentTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCppToolsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCppToolsTestCases
index cf50de7..993daee 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCppToolsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCppToolsTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsCppToolsTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsCppToolsTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCppToolsTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCurrentApiSignatureTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCurrentApiSignatureTestCases
index c35e14f..621b28b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCurrentApiSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCurrentApiSignatureTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsCurrentApiSignatureTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsCurrentApiSignatureTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCurrentApiSignatureTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDatabaseTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDatabaseTestCases
index 2ba24a2..d007699 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDatabaseTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDatabaseTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsDatabaseTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsDatabaseTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDatabaseTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDebugTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDebugTestCases
index 80dd45f..ef8f19b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDebugTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDebugTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsDebugTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsDebugTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDebugTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDeqpTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDeqpTestCases
index 9ed9d4c..e4986d3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDeqpTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDeqpTestCases
@@ -23,8 +23,8 @@
         max_retry=15,
         tag='9.0_r11.arm.CtsDeqpTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsDeqpTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDeqpTestCases'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDeqpTestCases', '--dynamic-config-url='],
+        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDeqpTestCases',
         target_plan=None,
         bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDeqpTestCases.dEQP-EGL b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDeqpTestCases.dEQP-EGL
index 36892b6..7f5b832 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDeqpTestCases.dEQP-EGL
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDeqpTestCases.dEQP-EGL
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsDeqpTestCases.dEQP-EGL',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsDeqpTestCases.dEQP-EGL',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-EGL.*'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
         target_plan=None,
         bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDeqpTestCases.dEQP-GLES2 b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDeqpTestCases.dEQP-GLES2
index 8a2cfe5..7be7e32 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDeqpTestCases.dEQP-GLES2
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDeqpTestCases.dEQP-GLES2
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsDeqpTestCases.dEQP-GLES2',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsDeqpTestCases.dEQP-GLES2',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES2.*'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
         target_plan=None,
         bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDeqpTestCases.dEQP-GLES3 b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDeqpTestCases.dEQP-GLES3
index 0e89982..3037141 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDeqpTestCases.dEQP-GLES3
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDeqpTestCases.dEQP-GLES3
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsDeqpTestCases.dEQP-GLES3',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsDeqpTestCases.dEQP-GLES3',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES3.*'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
         target_plan=None,
         bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDeqpTestCases.dEQP-GLES31 b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDeqpTestCases.dEQP-GLES31
index 994a5cd..6ff5f12 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDeqpTestCases.dEQP-GLES31
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDeqpTestCases.dEQP-GLES31
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsDeqpTestCases.dEQP-GLES31',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsDeqpTestCases.dEQP-GLES31',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES31.*'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
         target_plan=None,
         bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDeqpTestCases.dEQP-VK b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDeqpTestCases.dEQP-VK
index 539d683..1c8d8dd 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDeqpTestCases.dEQP-VK
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDeqpTestCases.dEQP-VK
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsDeqpTestCases.dEQP-VK',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsDeqpTestCases.dEQP-VK',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-VK.*'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
         target_plan=None,
         bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDevice b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDevice
index 2bb211f..ee9fa1c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDevice
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDevice
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsDevice',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsDevice',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeviceIdleHostTestCases', '--include-filter', 'CtsDevicePolicyManagerTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDexMetadataHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDexMetadataHostTestCases
index 321a116..3ee21e5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDexMetadataHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDexMetadataHostTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsDexMetadataHostTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsDexMetadataHostTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDexMetadataHostTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDisplayTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDisplayTestCases
index 73eb333..0e8d8e3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDisplayTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDisplayTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsDisplayTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsDisplayTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDisplayTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDpi b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDpi
index 9d4af2c..22ca2a3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDpi
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDpi
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsDpi',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsDpi',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDpiTestCases', '--include-filter', 'CtsDpiTestCases2', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDreamsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDreamsTestCases
index 336fbdc..e0f535b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDreamsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDreamsTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsDreamsTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsDreamsTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDreamsTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDrmTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDrmTestCases
index a50226f..2125c21 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDrmTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDrmTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsDrmTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsDrmTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDrmTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDumpsysHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDumpsysHostTestCases
index 84e4b9c..8dca988 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDumpsysHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDumpsysHostTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsDumpsysHostTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsDumpsysHostTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDumpsysHostTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDynamicLinkerTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDynamicLinkerTestCases
index 97b7994..80bdd9d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDynamicLinkerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDynamicLinkerTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsDynamicLinkerTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsDynamicLinkerTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDynamicLinkerTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsEdiHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsEdiHostTestCases
index f32e480..ff2568c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsEdiHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsEdiHostTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsEdiHostTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsEdiHostTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsEdiHostTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsEffectTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsEffectTestCases
index 5f847be..13b0cde 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsEffectTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsEffectTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsEffectTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsEffectTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsEffectTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsExternalS b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsExternalS
index 7ba2d28..765c55f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsExternalS
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsExternalS
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsExternalS',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsExternalS',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsExternalServiceTestCases', '--include-filter', 'CtsExternalSourcesTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsFileSystemTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsFileSystemTestCases
index 969630c..2f84092 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsFileSystemTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsFileSystemTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsFileSystemTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsFileSystemTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsFileSystemTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsFragment b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsFragment
index f5374c4..3b5d766 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsFragment
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsFragment
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsFragment',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsFragment',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsFragmentTestCases', '--include-filter', 'CtsFragmentTestCasesSdk26', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsGestureTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsGestureTestCases
index 09e1cba..dfc2037 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsGestureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsGestureTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsGestureTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsGestureTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsGestureTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsGpuToolsHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsGpuToolsHostTestCases
index e89f296..34b3786 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsGpuToolsHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsGpuToolsHostTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsGpuToolsHostTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsGpuToolsHostTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsGpuToolsHostTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsGraphicsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsGraphicsTestCases
index 6f6039c..ad9868e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsGraphicsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsGraphicsTestCases
@@ -23,8 +23,8 @@
         max_retry=3,
         tag='9.0_r11.arm.CtsGraphicsTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsGraphicsTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsGraphicsTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsHardwareTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsHardwareTestCases
index c9ffa49..4df07ad 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsHardwareTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsHardwareTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsHardwareTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsHardwareTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsHardwareTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsHarmfulAppWarningHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsHarmfulAppWarningHostTestCases
index 5c541bd..38059e5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsHarmfulAppWarningHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsHarmfulAppWarningHostTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsHarmfulAppWarningHostTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsHarmfulAppWarningHostTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsHarmfulAppWarningHostTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsHiddenApi b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsHiddenApi
index 48996b8..e39a49b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsHiddenApi
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsHiddenApi
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsHiddenApi',
         test_name='cheets_CTS_P.9.0_r11.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'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsHostTzDataTests b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsHostTzDataTests
index ff90d86..a5d67ca 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsHostTzDataTests
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsHostTzDataTests
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsHostTzDataTests',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsHostTzDataTests',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsHostTzDataTests', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsHostside b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsHostside
index a323d64..5b38046 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsHostside
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsHostside
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsHostside',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsHostside',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHostsideNetworkTests', '--include-filter', 'CtsHostsideNumberBlockingTestCases', '--include-filter', 'CtsHostsideTvTests', '--include-filter', 'CtsHostsideWebViewTests', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsIcuTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsIcuTestCases
index cf119db..f07b66d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsIcuTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsIcuTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsIcuTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsIcuTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsIcuTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsIncidentHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsIncidentHostTestCases
index 3108213..1a7ea5b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsIncidentHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsIncidentHostTestCases
@@ -23,8 +23,8 @@
         max_retry=30,
         tag='9.0_r11.arm.CtsIncidentHostTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsIncidentHostTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsIncidentHostTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsInlineMockingTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsInlineMockingTestCases
index beb36af..6068347 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsInlineMockingTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsInlineMockingTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsInlineMockingTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsInlineMockingTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsInlineMockingTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsInputMethod b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsInputMethod
index cd740f2..c2099f7 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsInputMethod
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsInputMethod
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsInputMethod',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsInputMethod',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsInputMethodServiceHostTestCases', '--include-filter', 'CtsInputMethodTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsJankDeviceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsJankDeviceTestCases
index 78c76bb..fe365fe 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsJankDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsJankDeviceTestCases
@@ -23,8 +23,8 @@
         max_retry=3,
         tag='9.0_r11.arm.CtsJankDeviceTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsJankDeviceTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsJankDeviceTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsJdwp b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsJdwp
index 8737a98..10de9ab 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsJdwp
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsJdwp
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsJdwp',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsJdwp',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJdwpSecurityHostTestCases', '--include-filter', 'CtsJdwpTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsJniTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsJniTestCases
index 689b031..fc80ce7 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsJniTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsJniTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsJniTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsJniTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsJniTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsJobScheduler b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsJobScheduler
index 2341efc..9c43e13 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsJobScheduler
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsJobScheduler
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsJobScheduler',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsJobScheduler',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJobSchedulerSharedUidTestCases', '--include-filter', 'CtsJobSchedulerTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsJvmti b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsJvmti
index 580d34c..d581bee 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsJvmti
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsJvmti
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsJvmti',
         test_name='cheets_CTS_P.9.0_r11.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'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsKernelConfigTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsKernelConfigTestCases
index 7d27458..3ffbf2d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsKernelConfigTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsKernelConfigTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsKernelConfigTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsKernelConfigTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsKernelConfigTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsKeystoreTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsKeystoreTestCases
index 66be459..7a1edfe 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsKeystoreTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsKeystoreTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsKeystoreTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsKeystoreTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsKeystoreTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsLeanbackJankTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsLeanbackJankTestCases
index dc32e80..924e0ed 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsLeanbackJankTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsLeanbackJankTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsLeanbackJankTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsLeanbackJankTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsLeanbackJankTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsLegacyNotificationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsLegacyNotificationTestCases
index 82b87de..f931b96 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsLegacyNotificationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsLegacyNotificationTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsLegacyNotificationTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsLegacyNotificationTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsLegacyNotificationTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsLibcore b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsLibcore
index 88e3b41..5f56741 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsLibcore
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsLibcore
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsLibcore',
         test_name='cheets_CTS_P.9.0_r11.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'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsLiblogTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsLiblogTestCases
index 78a1927..0213afb 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsLiblogTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsLiblogTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsLiblogTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsLiblogTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsLiblogTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsLocation b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsLocation
index 56d0607..e6b4aea 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsLocation
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsLocation
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsLocation',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsLocation',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLocation2TestCases', '--include-filter', 'CtsLocationTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsLogdTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsLogdTestCases
index 1099b62..eac774b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsLogdTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsLogdTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsLogdTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsLogdTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsLogdTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsMediaHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsMediaHostTestCases
index 16bd54d..a0780f1 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsMediaHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsMediaHostTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsMediaHostTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsMediaHostTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaHostTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsMidiTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsMidiTestCases
index 3a01246..579f9de 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsMidiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsMidiTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsMidiTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsMidiTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMidiTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsMocking b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsMocking
index d32e1fe..d43f057 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsMocking
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsMocking
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsMocking',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsMocking',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMockingDebuggableTestCases', '--include-filter', 'CtsMockingTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsMonkeyTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsMonkeyTestCases
index db72b93..4fcbb06 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsMonkeyTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsMonkeyTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsMonkeyTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsMonkeyTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMonkeyTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsMultiUser b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsMultiUser
index 6872cec..93da2f3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsMultiUser
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsMultiUser
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsMultiUser',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsMultiUser',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMultiUserHostTestCases', '--include-filter', 'CtsMultiUserTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsNNAPITestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsNNAPITestCases
index e3fa716..eb07807 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsNNAPITestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsNNAPITestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsNNAPITestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsNNAPITestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsNNAPITestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsNative b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsNative
index 5298502..ad618a3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsNative
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsNative
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsNative',
         test_name='cheets_CTS_P.9.0_r11.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'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsNdefTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsNdefTestCases
index 412a89d..c910e85 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsNdefTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsNdefTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsNdefTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsNdefTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsNdefTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsNet b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsNet
index b8f8642..c1409a5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsNet
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsNet
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsNet',
         test_name='cheets_CTS_P.9.0_r11.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'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsOmapiTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsOmapiTestCases
index c7d6fc9..1715048 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsOmapiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsOmapiTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsOmapiTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsOmapiTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsOmapiTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsOpenG b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsOpenG
index 9708dcb..1a80a8a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsOpenG
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsOpenG
@@ -23,8 +23,8 @@
         max_retry=3,
         tag='9.0_r11.arm.CtsOpenG',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsOpenG',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsOpenGLTestCases', '--include-filter', 'CtsOpenGlPerf2TestCases', '--include-filter', 'CtsOpenGlPerfTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsOs b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsOs
index 90d6a0b..f1b4743 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsOs
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsOs
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsOs',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsOs',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsOsHostTestCases', '--include-filter', 'CtsOsTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsPdfTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsPdfTestCases
index e6e1e85..93ef30e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsPdfTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsPdfTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsPdfTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsPdfTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsPdfTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsPerfettoTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsPerfettoTestCases
index 8114c3a..6b82c1b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsPerfettoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsPerfettoTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsPerfettoTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsPerfettoTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsPerfettoTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsPermission b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsPermission
index 5c172b1..d4eb083 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsPermission
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsPermission
@@ -23,8 +23,8 @@
         max_retry=3,
         tag='9.0_r11.arm.CtsPermission',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsPermission',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPermission2TestCases', '--include-filter', 'CtsPermissionTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsPreference b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsPreference
index 1b3d32a..79c56c4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsPreference
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsPreference
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsPreference',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsPreference',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPreference2TestCases', '--include-filter', 'CtsPreferenceTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsPrintTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsPrintTestCases
index 966cb8a..2b55058 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsPrintTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsPrintTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsPrintTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsPrintTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsPrintTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsProtoTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsProtoTestCases
index d82d35b..8969ba1 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsProtoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsProtoTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsProtoTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsProtoTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsProtoTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsProviderTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsProviderTestCases
index 9d3a158..e0e4eb1 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsProviderTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsProviderTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsProviderTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsProviderTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsProviderTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsRenderscript b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsRenderscript
index 4903a86..2823ce4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsRenderscript
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsRenderscript
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsRenderscript',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsRenderscript',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsRenderscriptLegacyTestCases', '--include-filter', 'CtsRenderscriptTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsRs b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsRs
index e0d46ed..935405d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsRs
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsRs
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsRs',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsRs',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsRsBlasTestCases', '--include-filter', 'CtsRsCppTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSample b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSample
index 5167d87..157e41b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSample
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSample
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsSample',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsSample',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSampleDeviceTestCases', '--include-filter', 'CtsSampleHostTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSaxTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSaxTestCases
index c32dfa1..b0ccbc4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSaxTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSaxTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsSaxTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsSaxTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSaxTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSeccompHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSeccompHostTestCases
index 2bf7799..b92cf91 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSeccompHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSeccompHostTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsSeccompHostTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsSeccompHostTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSeccompHostTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSecureElementAccessControl b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSecureElementAccessControl
index d5375ea..8f63016 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSecureElementAccessControl
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSecureElementAccessControl
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsSecureElementAccessControl',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsSecureElementAccessControl',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecureElementAccessControlTestCases1', '--include-filter', 'CtsSecureElementAccessControlTestCases2', '--include-filter', 'CtsSecureElementAccessControlTestCases3', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSecurity b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSecurity
index 73eee39..d3df278 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSecurity
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSecurity
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsSecurity',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsSecurity',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecurityBulletinHostTestCases', '--include-filter', 'CtsSecurityHostTestCases', '--include-filter', 'CtsSecurityTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSelinuxTargetSdk b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSelinuxTargetSdk
index 8f784fa..a846f6f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSelinuxTargetSdk
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSelinuxTargetSdk
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsSelinuxTargetSdk',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsSelinuxTargetSdk',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSelinuxTargetSdk25TestCases', '--include-filter', 'CtsSelinuxTargetSdk27TestCases', '--include-filter', 'CtsSelinuxTargetSdkCurrentTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSensorTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSensorTestCases
index 1f91d36..7dc6218 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSensorTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSensorTestCases
@@ -23,8 +23,8 @@
         max_retry=30,
         tag='9.0_r11.arm.CtsSensorTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsSensorTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSensorTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsShortcut b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsShortcut
index f2cc32f..3a36a0f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsShortcut
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsShortcut
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsShortcut',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsShortcut',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsShortcutHostTestCases', '--include-filter', 'CtsShortcutManagerTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSimRestrictedApisTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSimRestrictedApisTestCases
index 3011143..500b4cb 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSimRestrictedApisTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSimRestrictedApisTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsSimRestrictedApisTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsSimRestrictedApisTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSimRestrictedApisTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSimpleCpuTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSimpleCpuTestCases
index a1bbdc8..8159840 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSimpleCpuTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSimpleCpuTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsSimpleCpuTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsSimpleCpuTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSimpleCpuTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSimpleperfTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSimpleperfTestCases
index b2a7198..5b19d67 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSimpleperfTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSimpleperfTestCases
@@ -23,8 +23,8 @@
         max_retry=3,
         tag='9.0_r11.arm.CtsSimpleperfTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsSimpleperfTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSimpleperfTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSkQPTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSkQPTestCases
index 62bf3e3..8ad8a64 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSkQPTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSkQPTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsSkQPTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsSkQPTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSkQPTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSliceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSliceTestCases
index cf52345..8063228 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSliceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSliceTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsSliceTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsSliceTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSliceTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSpeechTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSpeechTestCases
index 1d48e19..e9fcdaa 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSpeechTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSpeechTestCases
@@ -23,8 +23,8 @@
         max_retry=3,
         tag='9.0_r11.arm.CtsSpeechTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsSpeechTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSpeechTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsStatsdHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsStatsdHostTestCases
index bd15023..35c2d0c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsStatsdHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsStatsdHostTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsStatsdHostTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsStatsdHostTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsStatsdHostTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSustainedPerformanceHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSustainedPerformanceHostTestCases
index 031b963..f1817d3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSustainedPerformanceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSustainedPerformanceHostTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsSustainedPerformanceHostTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsSustainedPerformanceHostTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSustainedPerformanceHostTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSync b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSync
index 8253e64..de7703c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSync
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSync
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsSync',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsSync',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSyncAccountAccessOtherCertTestCases', '--include-filter', 'CtsSyncContentHostTestCases', '--include-filter', 'CtsSyncManagerTestsCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSystem b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSystem
index e5edf4e..e155a9a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSystem
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSystem
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsSystem',
         test_name='cheets_CTS_P.9.0_r11.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'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsTelecom b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsTelecom
index da09149..70dfd35 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsTelecom
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsTelecom
@@ -23,8 +23,8 @@
         max_retry=3,
         tag='9.0_r11.arm.CtsTelecom',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsTelecom',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTelecomTestCases', '--include-filter', 'CtsTelecomTestCases2', '--include-filter', 'CtsTelecomTestCases3', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsTelephony b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsTelephony
index 2ffa83c..575836f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsTelephony
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsTelephony
@@ -23,8 +23,8 @@
         max_retry=3,
         tag='9.0_r11.arm.CtsTelephony',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsTelephony',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTelephony2TestCases', '--include-filter', 'CtsTelephonyTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsTextTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsTextTestCases
index c65abdf..ebe98b1 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsTextTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsTextTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsTextTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsTextTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsTextTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsTheme b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsTheme
index dc72dd5..4b4d1af 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsTheme
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsTheme
@@ -23,8 +23,8 @@
         max_retry=3,
         tag='9.0_r11.arm.CtsTheme',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsTheme',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsThemeDeviceTestCases', '--include-filter', 'CtsThemeHostTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsToast b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsToast
index 5cc7b75..140437d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsToast
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsToast
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsToast',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsToast',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsToastLegacyTestCases', '--include-filter', 'CtsToastTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsTransitionTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsTransitionTestCases
index 677593f..2617d11 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsTransitionTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsTransitionTestCases
@@ -23,8 +23,8 @@
         max_retry=3,
         tag='9.0_r11.arm.CtsTransitionTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsTransitionTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsTransitionTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsTrustedVoiceHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsTrustedVoiceHostTestCases
index 47605c4..e3aa716 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsTrustedVoiceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsTrustedVoiceHostTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsTrustedVoiceHostTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsTrustedVoiceHostTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsTrustedVoiceHostTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsTv b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsTv
index 9624365..659804d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsTv
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsTv
@@ -23,8 +23,8 @@
         max_retry=3,
         tag='9.0_r11.arm.CtsTv',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsTv',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTvProviderTestCases', '--include-filter', 'CtsTvTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsUi b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsUi
index d5df18b..9d59443 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsUi
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsUi
@@ -23,8 +23,8 @@
         max_retry=3,
         tag='9.0_r11.arm.CtsUi',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsUi',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUiAutomationTestCases', '--include-filter', 'CtsUiDeviceTestCases', '--include-filter', 'CtsUiRenderingTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsUidIsolationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsUidIsolationTestCases
index 0e21bb9..3afeaf8 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsUidIsolationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsUidIsolationTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsUidIsolationTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsUidIsolationTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsUidIsolationTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsUsageStatsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsUsageStatsTestCases
index ca3a16f..f3a2bcf 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsUsageStatsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsUsageStatsTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsUsageStatsTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsUsageStatsTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsUsageStatsTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsUsbTests b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsUsbTests
index 331e0f0..ae21ae2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsUsbTests
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsUsbTests
@@ -23,8 +23,8 @@
         max_retry=3,
         tag='9.0_r11.arm.CtsUsbTests',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsUsbTests',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsUsbTests', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsUtilTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsUtilTestCases
index d1812c3..fdc8db3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsUtilTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsUtilTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsUtilTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsUtilTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsUtilTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsVideoTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsVideoTestCases
index 2431ed3..c46e87c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsVideoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsVideoTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsVideoTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsVideoTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsVideoTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsViewTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsViewTestCases
index 0a2fb7e..4a87aa2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsViewTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsViewTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsViewTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsViewTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsViewTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsViewTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsViewTestCases',
         target_plan=None,
         bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsVmTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsVmTestCases
index c29f5b2..b9fb99b23 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsVmTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsVmTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsVmTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsVmTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsVmTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsVoice b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsVoice
index dce887a..34ff2e2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsVoice
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsVoice
@@ -23,8 +23,8 @@
         max_retry=3,
         tag='9.0_r11.arm.CtsVoice',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsVoice',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsVoiceInteractionTestCases', '--include-filter', 'CtsVoiceSettingsTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsVrTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsVrTestCases
index 207d1e8..cdb3772 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsVrTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsVrTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsVrTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsVrTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsVrTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsWebkitTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsWebkitTestCases
index 36755a2..3418ec7 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsWebkitTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsWebkitTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsWebkitTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsWebkitTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsWebkitTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsWidgetTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsWidgetTestCases
index 17f6a01..9bcda30 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsWidgetTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsWidgetTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsWidgetTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsWidgetTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsWidgetTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsWindowManagerDeviceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsWindowManagerDeviceTestCases
index bc8df94..35ce010 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsWindowManagerDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsWindowManagerDeviceTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsWindowManagerDeviceTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsWindowManagerDeviceTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsWindowManagerDeviceTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsWrap b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsWrap
index 373947b..5c18222 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsWrap
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsWrap
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.CtsWrap',
         test_name='cheets_CTS_P.9.0_r11.arm.CtsWrap',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsWrapNoWrapTestCases', '--include-filter', 'CtsWrapWrapDebugMallocDebugTestCases', '--include-filter', 'CtsWrapWrapDebugTestCases', '--include-filter', 'CtsWrapWrapNoDebugTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases
index fb19074..d7406bb 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases
@@ -23,8 +23,8 @@
         max_retry=9,
         tag='9.0_r11.arm.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAbiOverrideHostTestCases', '--include-filter', 'CtsAccelerationTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
         target_plan=None,
         bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases
index bfd98e8..9d17571 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases
@@ -23,8 +23,8 @@
         max_retry=9,
         tag='9.0_r11.arm.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAccessibilityServiceTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
         target_plan=None,
         bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases
index 870aebe..01c95b0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases
@@ -23,8 +23,8 @@
         max_retry=9,
         tag='9.0_r11.arm.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAccessibilityTestCases', '--include-filter', 'CtsAccountManagerTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
         target_plan=None,
         bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases
index ea62f7c..97bf568 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases
@@ -23,8 +23,8 @@
         max_retry=9,
         tag='9.0_r11.arm.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsActivityManagerDeviceSdk25TestCases', '--include-filter', 'CtsActivityManagerDeviceTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
         target_plan=None,
         bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases
index c3e5b87..16e2596 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases
@@ -24,8 +24,8 @@
         enable_default_apps=True,
         tag='9.0_r11.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases',
         test_name='cheets_CTS_P.9.0_r11.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'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
         target_plan=None,
         bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases
index da49eaf..176e3a8 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases
@@ -23,8 +23,8 @@
         max_retry=15,
         tag='9.0_r11.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDeqpTestCases'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDeqpTestCases', '--dynamic-config-url='],
+        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsDeqpTestCases_-_CtsDeqpTestCases',
         target_plan=None,
         bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases
index 4b6b9f1..5981060 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases
@@ -23,8 +23,8 @@
         max_retry=9,
         tag='9.0_r11.arm.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases',
         test_name='cheets_CTS_P.9.0_r11.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'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
         target_plan=None,
         bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
index 86bbbb7..04df4ce 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
@@ -23,8 +23,8 @@
         max_retry=9,
         tag='9.0_r11.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsFileSystemTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
         target_plan=None,
         bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases
index 0b7dc8d..9736cb9 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases
@@ -23,8 +23,8 @@
         max_retry=9,
         tag='9.0_r11.arm.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases',
         test_name='cheets_CTS_P.9.0_r11.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'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
         target_plan=None,
         bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases
index bb2b1ba..86c137c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases
@@ -23,8 +23,8 @@
         max_retry=9,
         tag='9.0_r11.arm.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaHostTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
         target_plan=None,
         bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases
index faa59f4..72a5625 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases
@@ -23,8 +23,8 @@
         max_retry=9,
         tag='9.0_r11.arm.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases',
         test_name='cheets_CTS_P.9.0_r11.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'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
         target_plan=None,
         bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases
index 166d462..5cc64da 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases
@@ -23,8 +23,8 @@
         max_retry=9,
         tag='9.0_r11.arm.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSecurityHostTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
         target_plan=None,
         bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases
index e0fe338..fb7df28 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases
@@ -23,8 +23,8 @@
         max_retry=9,
         tag='9.0_r11.arm.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecurityTestCases', '--include-filter', 'CtsSelinuxTargetSdk25TestCases', '--include-filter', 'CtsSelinuxTargetSdk27TestCases', '--include-filter', 'CtsSelinuxTargetSdkCurrentTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
         target_plan=None,
         bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsSensorTestCases_-_CtsSensorTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsSensorTestCases_-_CtsSensorTestCases
index 582944b..c7dc939 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsSensorTestCases_-_CtsSensorTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsSensorTestCases_-_CtsSensorTestCases
@@ -23,8 +23,8 @@
         max_retry=30,
         tag='9.0_r11.arm.all.CtsSensorTestCases_-_CtsSensorTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.all.CtsSensorTestCases_-_CtsSensorTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSensorTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
         target_plan=None,
         bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsShortcutHostTestCases_-_CtsVideoTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsShortcutHostTestCases_-_CtsVideoTestCases
index 504f673..37ba17c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsShortcutHostTestCases_-_CtsVideoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsShortcutHostTestCases_-_CtsVideoTestCases
@@ -23,8 +23,8 @@
         max_retry=9,
         tag='9.0_r11.arm.all.CtsShortcutHostTestCases_-_CtsVideoTestCases',
         test_name='cheets_CTS_P.9.0_r11.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'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
         target_plan=None,
         bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsViewTestCases_-_CtsViewTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsViewTestCases_-_CtsViewTestCases
index ed0b262..42540d6 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsViewTestCases_-_CtsViewTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsViewTestCases_-_CtsViewTestCases
@@ -23,8 +23,8 @@
         max_retry=9,
         tag='9.0_r11.arm.all.CtsViewTestCases_-_CtsViewTestCases',
         test_name='cheets_CTS_P.9.0_r11.arm.all.CtsViewTestCases_-_CtsViewTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsViewTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsViewTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsViewTestCases_-_CtsViewTestCases',
         target_plan=None,
         bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsVmTestCases_-_vm-tests-tf b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsVmTestCases_-_vm-tests-tf
index 814e125..fea2659 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsVmTestCases_-_vm-tests-tf
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsVmTestCases_-_vm-tests-tf
@@ -23,8 +23,8 @@
         max_retry=9,
         tag='9.0_r11.arm.all.CtsVmTestCases_-_vm-tests-tf',
         test_name='cheets_CTS_P.9.0_r11.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'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
         target_plan=None,
         bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.cts-system-all.api b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.cts-system-all.api
index 5b594db..f6a560c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.cts-system-all.api
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.cts-system-all.api
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.cts-system-all.api',
         test_name='cheets_CTS_P.9.0_r11.arm.cts-system-all.api',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'cts-system-all.api', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.signed-CtsSecureElementAccessControl b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.signed-CtsSecureElementAccessControl
index b5598b0..5af6db5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.signed-CtsSecureElementAccessControl
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.signed-CtsSecureElementAccessControl
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.signed-CtsSecureElementAccessControl',
         test_name='cheets_CTS_P.9.0_r11.arm.signed-CtsSecureElementAccessControl',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases1', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases2', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases3', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.tradefed-run-collect-tests-only-internal b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.tradefed-run-collect-tests-only-internal
index 01b56f3..cf373c1 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.tradefed-run-collect-tests-only-internal
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.tradefed-run-collect-tests-only-internal
@@ -23,7 +23,7 @@
         max_retry=0,
         tag='9.0_r11.arm.tradefed-run-collect-tests-only-internal',
         test_name='cheets_CTS_P.9.0_r11.arm.tradefed-run-collect-tests-only-internal',
-        run_template=['run', 'commandAndExit', 'collect-tests-only', '--disable-reboot', '--module-arg', 'CtsMediaTestCases:skip-media-download:true', '--module-arg', 'CtsMediaStressTestCases:skip-media-download:true', '--module-arg', 'CtsMediaBitstreamsTestCases:skip-media-download:true'],
+        run_template=['run', 'commandAndExit', 'collect-tests-only', '--disable-reboot', '--module-arg', 'CtsMediaTestCases:skip-media-download:true', '--module-arg', 'CtsMediaStressTestCases:skip-media-download:true', '--module-arg', 'CtsMediaBitstreamsTestCases:skip-media-download:true', '--dynamic-config-url='],
         retry_template=None,
         target_module=None,
         target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.vm-tests-tf b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.vm-tests-tf
index 6b0bf6d..dde0c7d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.vm-tests-tf
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.vm-tests-tf
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.vm-tests-tf',
         test_name='cheets_CTS_P.9.0_r11.arm.vm-tests-tf',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'vm-tests-tf', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.wm-presubmit b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.wm-presubmit
index 9b8e148..a528867 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.wm-presubmit
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.wm-presubmit
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.arm.wm-presubmit',
         test_name='cheets_CTS_P.9.0_r11.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'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
         target_plan=None,
         bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAbiOverrideHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAbiOverrideHostTestCases
index d09e4d6..1a73461 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAbiOverrideHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAbiOverrideHostTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsAbiOverrideHostTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsAbiOverrideHostTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAbiOverrideHostTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAccelerationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAccelerationTestCases
index c26a4c9..a381a41 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAccelerationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAccelerationTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsAccelerationTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsAccelerationTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAccelerationTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAccessibility b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAccessibility
index 7e77dbe..ffe4081 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAccessibility
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAccessibility
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsAccessibility',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsAccessibility',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAccessibilityServiceTestCases', '--include-filter', 'CtsAccessibilityTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAccountManagerTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAccountManagerTestCases
index e67e485..a73421f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAccountManagerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAccountManagerTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsAccountManagerTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsAccountManagerTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAccountManagerTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsActivityManagerDevice b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsActivityManagerDevice
index 790cc41..6ba5dec 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsActivityManagerDevice
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsActivityManagerDevice
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsActivityManagerDevice',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsActivityManagerDevice',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsActivityManagerDeviceSdk25TestCases', '--include-filter', 'CtsActivityManagerDeviceTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAdmin b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAdmin
index abee7de..f575f35 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAdmin
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAdmin
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsAdmin',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsAdmin',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAdminPackageInstallerTestCases', '--include-filter', 'CtsAdminTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAlarm b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAlarm
index acc4737..051afea 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAlarm
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAlarm
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsAlarm',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsAlarm',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAlarmClockTestCases', '--include-filter', 'CtsAlarmManagerTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAndroid b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAndroid
index a2cb269..de82d9d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAndroid
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAndroid
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsAndroid',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsAndroid',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAndroidAppTestCases', '--include-filter', 'CtsAndroidTestBase27ApiSignatureTestCases', '--include-filter', 'CtsAndroidTestMockCurrentApiSignatureTestCases', '--include-filter', 'CtsAndroidTestRunnerCurrentApiSignatureTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAnimationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAnimationTestCases
index 86ae987..c8f84bb 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAnimationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAnimationTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsAnimationTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsAnimationTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAnimationTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsApacheHttpLegacy b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsApacheHttpLegacy
index 2757ab3..98f44b7 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsApacheHttpLegacy
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsApacheHttpLegacy
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsApacheHttpLegacy',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsApacheHttpLegacy',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsApacheHttpLegacy27ApiSignatureTestCases', '--include-filter', 'CtsApacheHttpLegacyCurrentApiSignatureTestCases', '--include-filter', 'CtsApacheHttpLegacyUsesLibraryApiSignatureTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsApp b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsApp
index a3b3258..0071b01 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsApp
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsApp
@@ -23,8 +23,8 @@
         enable_default_apps=True,
         tag='9.0_r11.x86.CtsApp',
         test_name='cheets_CTS_P.9.0_r11.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'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAslrMallocTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAslrMallocTestCases
index 6dca0ca..38bb9ec 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAslrMallocTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAslrMallocTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsAslrMallocTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsAslrMallocTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAslrMallocTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAssistTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAssistTestCases
index 30bbe26..0e1f3de 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAssistTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAssistTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsAssistTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsAssistTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAssistTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAtraceHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAtraceHostTestCases
index df5103f..1e0f2de 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAtraceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAtraceHostTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsAtraceHostTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsAtraceHostTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAtraceHostTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAutoFillServiceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAutoFillServiceTestCases
index 5773cca..4c590c2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAutoFillServiceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAutoFillServiceTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsAutoFillServiceTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsAutoFillServiceTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAutoFillServiceTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsBackgroundRestrictionsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsBackgroundRestrictionsTestCases
index 9d4e824..f1025ee 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsBackgroundRestrictionsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsBackgroundRestrictionsTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsBackgroundRestrictionsTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsBackgroundRestrictionsTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsBackgroundRestrictionsTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsBackup b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsBackup
index d20df13..88ea797 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsBackup
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsBackup
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsBackup',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsBackup',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsBackupHostTestCases', '--include-filter', 'CtsBackupTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsBatterySavingTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsBatterySavingTestCases
index 669201d..8f66b43 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsBatterySavingTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsBatterySavingTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsBatterySavingTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsBatterySavingTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsBatterySavingTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsBionicTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsBionicTestCases
index 8580cc8..1f78a94 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsBionicTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsBionicTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsBionicTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsBionicTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsBionicTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsBluetoothTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsBluetoothTestCases
index 3916628..265830c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsBluetoothTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsBluetoothTestCases
@@ -35,8 +35,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsBluetoothTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsBluetoothTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsBluetoothTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsBootStatsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsBootStatsTestCases
index 5eb0824..b022be4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsBootStatsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsBootStatsTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsBootStatsTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsBootStatsTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsBootStatsTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCalendarcommon2TestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCalendarcommon2TestCases
index c980ccf..7488137 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCalendarcommon2TestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCalendarcommon2TestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsCalendarcommon2TestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsCalendarcommon2TestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCalendarcommon2TestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCamera b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCamera
index f3bf0d5..0abfa12 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCamera
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCamera
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsCamera',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsCamera',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraApi25TestCases', '--include-filter', 'CtsCameraTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCameraTestCases.camerabox.back b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCameraTestCases.camerabox.back
index c4fabfd..9264269 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCameraTestCases.camerabox.back
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCameraTestCases.camerabox.back
@@ -24,8 +24,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsCameraTestCases.camerabox.back',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsCameraTestCases.camerabox.back',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCameraTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCameraTestCases.camerabox.front b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCameraTestCases.camerabox.front
index 0de4cc9..3e495a2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCameraTestCases.camerabox.front
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCameraTestCases.camerabox.front
@@ -24,8 +24,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsCameraTestCases.camerabox.front',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsCameraTestCases.camerabox.front',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCameraTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCarTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCarTestCases
index e2f48c2..db539af 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCarTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCarTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsCarTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsCarTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCarTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCarrierApiTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCarrierApiTestCases
index 874c6ad..8f989d8 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCarrierApiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCarrierApiTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsCarrierApiTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsCarrierApiTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCarrierApiTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsColorModeTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsColorModeTestCases
index a3bef02..912579b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsColorModeTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsColorModeTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsColorModeTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsColorModeTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsColorModeTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCompilationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCompilationTestCases
index 13286b8..53b7acd 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCompilationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCompilationTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsCompilationTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsCompilationTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCompilationTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsContactsProviderWipe b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsContactsProviderWipe
index 5b6abe8..b09188d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsContactsProviderWipe
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsContactsProviderWipe
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsContactsProviderWipe',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsContactsProviderWipe',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsContactsProviderWipe', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsContentTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsContentTestCases
index 81f2dc5..ecf1195 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsContentTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsContentTestCases
@@ -23,8 +23,8 @@
         enable_default_apps=True,
         tag='9.0_r11.x86.CtsContentTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsContentTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsContentTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCppToolsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCppToolsTestCases
index 650465f..e646e2d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCppToolsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCppToolsTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsCppToolsTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsCppToolsTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCppToolsTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCurrentApiSignatureTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCurrentApiSignatureTestCases
index 3951fe4..d1ac138 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCurrentApiSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCurrentApiSignatureTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsCurrentApiSignatureTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsCurrentApiSignatureTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCurrentApiSignatureTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDatabaseTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDatabaseTestCases
index 4ef108b..c60c3f5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDatabaseTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDatabaseTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsDatabaseTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsDatabaseTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDatabaseTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDebugTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDebugTestCases
index c9f697e..ca547c8 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDebugTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDebugTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsDebugTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsDebugTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDebugTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDeqpTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDeqpTestCases
index 66c60a9..61f0f03 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDeqpTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDeqpTestCases
@@ -23,8 +23,8 @@
         max_retry=15,
         tag='9.0_r11.x86.CtsDeqpTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsDeqpTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDeqpTestCases'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDeqpTestCases', '--dynamic-config-url='],
+        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDeqpTestCases',
         target_plan=None,
         bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDeqpTestCases.dEQP-EGL b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDeqpTestCases.dEQP-EGL
index 8345b35..7a8d6f1 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDeqpTestCases.dEQP-EGL
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDeqpTestCases.dEQP-EGL
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsDeqpTestCases.dEQP-EGL',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsDeqpTestCases.dEQP-EGL',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-EGL.*'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
         target_plan=None,
         bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDeqpTestCases.dEQP-GLES2 b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDeqpTestCases.dEQP-GLES2
index 4371d1c..795ae96 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDeqpTestCases.dEQP-GLES2
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDeqpTestCases.dEQP-GLES2
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsDeqpTestCases.dEQP-GLES2',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsDeqpTestCases.dEQP-GLES2',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES2.*'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
         target_plan=None,
         bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDeqpTestCases.dEQP-GLES3 b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDeqpTestCases.dEQP-GLES3
index 5319e0d..f5cde1f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDeqpTestCases.dEQP-GLES3
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDeqpTestCases.dEQP-GLES3
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsDeqpTestCases.dEQP-GLES3',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsDeqpTestCases.dEQP-GLES3',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES3.*'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
         target_plan=None,
         bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDeqpTestCases.dEQP-GLES31 b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDeqpTestCases.dEQP-GLES31
index b40e1f5..9cce8b9 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDeqpTestCases.dEQP-GLES31
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDeqpTestCases.dEQP-GLES31
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsDeqpTestCases.dEQP-GLES31',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsDeqpTestCases.dEQP-GLES31',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES31.*'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
         target_plan=None,
         bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDeqpTestCases.dEQP-VK b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDeqpTestCases.dEQP-VK
index 4ba4f36..46635df 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDeqpTestCases.dEQP-VK
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDeqpTestCases.dEQP-VK
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsDeqpTestCases.dEQP-VK',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsDeqpTestCases.dEQP-VK',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-VK.*'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
         target_plan=None,
         bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDevice b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDevice
index 755d8e2..9633294 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDevice
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDevice
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsDevice',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsDevice',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeviceIdleHostTestCases', '--include-filter', 'CtsDevicePolicyManagerTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDexMetadataHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDexMetadataHostTestCases
index 57f7397..fb9fc5c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDexMetadataHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDexMetadataHostTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsDexMetadataHostTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsDexMetadataHostTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDexMetadataHostTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDisplayTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDisplayTestCases
index 917123b..3ee47ba 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDisplayTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDisplayTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsDisplayTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsDisplayTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDisplayTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDpi b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDpi
index 10a84b3..7c67617 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDpi
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDpi
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsDpi',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsDpi',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDpiTestCases', '--include-filter', 'CtsDpiTestCases2', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDreamsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDreamsTestCases
index b94f41a..a118dd9 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDreamsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDreamsTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsDreamsTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsDreamsTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDreamsTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDrmTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDrmTestCases
index 4421d67..c9ac454 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDrmTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDrmTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsDrmTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsDrmTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDrmTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDumpsysHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDumpsysHostTestCases
index a7ea535..98a8167 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDumpsysHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDumpsysHostTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsDumpsysHostTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsDumpsysHostTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDumpsysHostTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDynamicLinkerTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDynamicLinkerTestCases
index 379c243..9f81c9a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDynamicLinkerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDynamicLinkerTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsDynamicLinkerTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsDynamicLinkerTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDynamicLinkerTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsEdiHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsEdiHostTestCases
index 281aba4..a5e7cf1 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsEdiHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsEdiHostTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsEdiHostTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsEdiHostTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsEdiHostTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsEffectTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsEffectTestCases
index db3b16b..baa3156 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsEffectTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsEffectTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsEffectTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsEffectTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsEffectTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsExternalS b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsExternalS
index 1dceb5c..f5f73b3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsExternalS
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsExternalS
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsExternalS',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsExternalS',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsExternalServiceTestCases', '--include-filter', 'CtsExternalSourcesTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsFileSystemTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsFileSystemTestCases
index 026a12e..9b0c626 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsFileSystemTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsFileSystemTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsFileSystemTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsFileSystemTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsFileSystemTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsFragment b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsFragment
index 5326e68..f4ec07a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsFragment
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsFragment
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsFragment',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsFragment',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsFragmentTestCases', '--include-filter', 'CtsFragmentTestCasesSdk26', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsGestureTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsGestureTestCases
index e4505b5..825e26f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsGestureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsGestureTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsGestureTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsGestureTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsGestureTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsGpuToolsHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsGpuToolsHostTestCases
index b675a06..dbc103a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsGpuToolsHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsGpuToolsHostTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsGpuToolsHostTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsGpuToolsHostTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsGpuToolsHostTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsGraphicsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsGraphicsTestCases
index cd9fd34..142d611 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsGraphicsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsGraphicsTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsGraphicsTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsGraphicsTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsGraphicsTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsHardwareTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsHardwareTestCases
index 7f15f26..f95c478 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsHardwareTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsHardwareTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsHardwareTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsHardwareTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsHardwareTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsHarmfulAppWarningHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsHarmfulAppWarningHostTestCases
index 1963046..a9947bd 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsHarmfulAppWarningHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsHarmfulAppWarningHostTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsHarmfulAppWarningHostTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsHarmfulAppWarningHostTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsHarmfulAppWarningHostTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsHiddenApi b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsHiddenApi
index 3dbfca3..0eb22c4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsHiddenApi
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsHiddenApi
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsHiddenApi',
         test_name='cheets_CTS_P.9.0_r11.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'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsHostTzDataTests b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsHostTzDataTests
index 1a6bb87..741b69a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsHostTzDataTests
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsHostTzDataTests
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsHostTzDataTests',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsHostTzDataTests',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsHostTzDataTests', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsHostside b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsHostside
index f5d65f8..a150064 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsHostside
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsHostside
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsHostside',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsHostside',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHostsideNetworkTests', '--include-filter', 'CtsHostsideNumberBlockingTestCases', '--include-filter', 'CtsHostsideTvTests', '--include-filter', 'CtsHostsideWebViewTests', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsIcuTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsIcuTestCases
index 585eaec..fe4059c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsIcuTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsIcuTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsIcuTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsIcuTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsIcuTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsIncidentHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsIncidentHostTestCases
index c1fa900..3d9a2d1 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsIncidentHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsIncidentHostTestCases
@@ -23,8 +23,8 @@
         max_retry=30,
         tag='9.0_r11.x86.CtsIncidentHostTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsIncidentHostTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsIncidentHostTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsInlineMockingTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsInlineMockingTestCases
index 593f249..34bf3df 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsInlineMockingTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsInlineMockingTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsInlineMockingTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsInlineMockingTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsInlineMockingTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsInputMethod b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsInputMethod
index f2f7125..0c8710e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsInputMethod
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsInputMethod
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsInputMethod',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsInputMethod',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsInputMethodServiceHostTestCases', '--include-filter', 'CtsInputMethodTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsJankDeviceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsJankDeviceTestCases
index 1bdff04..6ae8ac4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsJankDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsJankDeviceTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsJankDeviceTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsJankDeviceTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsJankDeviceTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsJdwp b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsJdwp
index bb2f551..dcbde2b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsJdwp
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsJdwp
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsJdwp',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsJdwp',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJdwpSecurityHostTestCases', '--include-filter', 'CtsJdwpTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsJniTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsJniTestCases
index ce7b850..21b5780 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsJniTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsJniTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsJniTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsJniTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsJniTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsJobScheduler b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsJobScheduler
index 62bb8f0..726852d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsJobScheduler
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsJobScheduler
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsJobScheduler',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsJobScheduler',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJobSchedulerSharedUidTestCases', '--include-filter', 'CtsJobSchedulerTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsJvmti b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsJvmti
index 5c28a28..a24afa4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsJvmti
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsJvmti
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsJvmti',
         test_name='cheets_CTS_P.9.0_r11.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'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsKernelConfigTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsKernelConfigTestCases
index e8a2a44..82b06d3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsKernelConfigTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsKernelConfigTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsKernelConfigTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsKernelConfigTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsKernelConfigTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsKeystoreTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsKeystoreTestCases
index 13c89ef..71b53c6 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsKeystoreTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsKeystoreTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsKeystoreTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsKeystoreTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsKeystoreTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsLeanbackJankTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsLeanbackJankTestCases
index e385c11..aa25bd9 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsLeanbackJankTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsLeanbackJankTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsLeanbackJankTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsLeanbackJankTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsLeanbackJankTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsLegacyNotificationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsLegacyNotificationTestCases
index fa5d894..733ed14 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsLegacyNotificationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsLegacyNotificationTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsLegacyNotificationTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsLegacyNotificationTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsLegacyNotificationTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsLibcore b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsLibcore
index f09dcb8..9524848 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsLibcore
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsLibcore
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsLibcore',
         test_name='cheets_CTS_P.9.0_r11.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'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsLiblogTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsLiblogTestCases
index af344d6..06472d2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsLiblogTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsLiblogTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsLiblogTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsLiblogTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsLiblogTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsLocation b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsLocation
index a7e9160..093a158 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsLocation
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsLocation
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsLocation',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsLocation',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLocation2TestCases', '--include-filter', 'CtsLocationTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsLogdTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsLogdTestCases
index 24c6623..8874373 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsLogdTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsLogdTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsLogdTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsLogdTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsLogdTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsMediaHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsMediaHostTestCases
index 9f20027..be2fc2f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsMediaHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsMediaHostTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsMediaHostTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsMediaHostTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaHostTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsMidiTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsMidiTestCases
index b235d71..52857bc 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsMidiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsMidiTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsMidiTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsMidiTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMidiTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsMocking b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsMocking
index 8ceb74e..a4c036e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsMocking
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsMocking
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsMocking',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsMocking',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMockingDebuggableTestCases', '--include-filter', 'CtsMockingTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsMonkeyTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsMonkeyTestCases
index 6f36b8c..1d0dfff 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsMonkeyTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsMonkeyTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsMonkeyTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsMonkeyTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMonkeyTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsMultiUser b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsMultiUser
index aab1a3f..949d723 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsMultiUser
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsMultiUser
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsMultiUser',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsMultiUser',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMultiUserHostTestCases', '--include-filter', 'CtsMultiUserTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsNNAPITestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsNNAPITestCases
index 70585b1..de30d64 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsNNAPITestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsNNAPITestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsNNAPITestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsNNAPITestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsNNAPITestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsNative b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsNative
index a2f04e9..c922bd6 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsNative
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsNative
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsNative',
         test_name='cheets_CTS_P.9.0_r11.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'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsNdefTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsNdefTestCases
index bda7797..5baa51d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsNdefTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsNdefTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsNdefTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsNdefTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsNdefTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsNet b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsNet
index e1a0f0b..b772bad 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsNet
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsNet
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsNet',
         test_name='cheets_CTS_P.9.0_r11.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'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsOmapiTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsOmapiTestCases
index 68aa80c..4d512b8 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsOmapiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsOmapiTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsOmapiTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsOmapiTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsOmapiTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsOpenG b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsOpenG
index 54d40b8..6f9b670 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsOpenG
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsOpenG
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsOpenG',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsOpenG',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsOpenGLTestCases', '--include-filter', 'CtsOpenGlPerf2TestCases', '--include-filter', 'CtsOpenGlPerfTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsOs b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsOs
index d942745..5a7cf77 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsOs
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsOs
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsOs',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsOs',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsOsHostTestCases', '--include-filter', 'CtsOsTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsPdfTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsPdfTestCases
index e9568f2..77e7740 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsPdfTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsPdfTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsPdfTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsPdfTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsPdfTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsPerfettoTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsPerfettoTestCases
index 5831400..c627aa1 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsPerfettoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsPerfettoTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsPerfettoTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsPerfettoTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsPerfettoTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsPermission b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsPermission
index 1fe7da4..2afd53e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsPermission
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsPermission
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsPermission',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsPermission',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPermission2TestCases', '--include-filter', 'CtsPermissionTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsPreference b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsPreference
index 65214d8..6d6a8ea 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsPreference
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsPreference
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsPreference',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsPreference',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPreference2TestCases', '--include-filter', 'CtsPreferenceTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsPrintTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsPrintTestCases
index 54b39b8..2f69a82 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsPrintTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsPrintTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsPrintTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsPrintTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsPrintTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsProtoTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsProtoTestCases
index aead633..ce57cc1 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsProtoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsProtoTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsProtoTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsProtoTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsProtoTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsProviderTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsProviderTestCases
index 67c179c..5139cd3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsProviderTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsProviderTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsProviderTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsProviderTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsProviderTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsRenderscript b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsRenderscript
index 65aa8d2..da9abdb 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsRenderscript
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsRenderscript
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsRenderscript',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsRenderscript',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsRenderscriptLegacyTestCases', '--include-filter', 'CtsRenderscriptTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsRs b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsRs
index db21105..33948a3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsRs
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsRs
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsRs',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsRs',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsRsBlasTestCases', '--include-filter', 'CtsRsCppTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSample b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSample
index a9c7363..1cb4236 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSample
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSample
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsSample',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsSample',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSampleDeviceTestCases', '--include-filter', 'CtsSampleHostTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSaxTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSaxTestCases
index 0066f52..dfd7bdd 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSaxTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSaxTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsSaxTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsSaxTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSaxTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSeccompHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSeccompHostTestCases
index a7d6133..e108e12 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSeccompHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSeccompHostTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsSeccompHostTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsSeccompHostTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSeccompHostTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSecureElementAccessControl b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSecureElementAccessControl
index 2f84763..43146f8 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSecureElementAccessControl
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSecureElementAccessControl
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsSecureElementAccessControl',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsSecureElementAccessControl',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecureElementAccessControlTestCases1', '--include-filter', 'CtsSecureElementAccessControlTestCases2', '--include-filter', 'CtsSecureElementAccessControlTestCases3', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSecurity b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSecurity
index c5003fc..2155d55 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSecurity
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSecurity
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsSecurity',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsSecurity',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecurityBulletinHostTestCases', '--include-filter', 'CtsSecurityHostTestCases', '--include-filter', 'CtsSecurityTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSelinuxTargetSdk b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSelinuxTargetSdk
index 3a30840..371164d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSelinuxTargetSdk
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSelinuxTargetSdk
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsSelinuxTargetSdk',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsSelinuxTargetSdk',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSelinuxTargetSdk25TestCases', '--include-filter', 'CtsSelinuxTargetSdk27TestCases', '--include-filter', 'CtsSelinuxTargetSdkCurrentTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSensorTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSensorTestCases
index 3606d40..6cec0ad 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSensorTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSensorTestCases
@@ -23,8 +23,8 @@
         max_retry=30,
         tag='9.0_r11.x86.CtsSensorTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsSensorTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSensorTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsShortcut b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsShortcut
index 237540b..936cf54 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsShortcut
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsShortcut
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsShortcut',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsShortcut',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsShortcutHostTestCases', '--include-filter', 'CtsShortcutManagerTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSimRestrictedApisTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSimRestrictedApisTestCases
index eb3d0a7..7c68783 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSimRestrictedApisTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSimRestrictedApisTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsSimRestrictedApisTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsSimRestrictedApisTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSimRestrictedApisTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSimpleCpuTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSimpleCpuTestCases
index 12e8aa5..a1861d2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSimpleCpuTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSimpleCpuTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsSimpleCpuTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsSimpleCpuTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSimpleCpuTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSimpleperfTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSimpleperfTestCases
index e5c8779..4ff9cca 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSimpleperfTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSimpleperfTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsSimpleperfTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsSimpleperfTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSimpleperfTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSkQPTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSkQPTestCases
index 4daf13c..f16448d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSkQPTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSkQPTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsSkQPTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsSkQPTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSkQPTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSliceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSliceTestCases
index 07884eb..0238709 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSliceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSliceTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsSliceTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsSliceTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSliceTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSpeechTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSpeechTestCases
index 2f1d512..172c34a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSpeechTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSpeechTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsSpeechTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsSpeechTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSpeechTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsStatsdHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsStatsdHostTestCases
index a50c97d..dc27d4a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsStatsdHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsStatsdHostTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsStatsdHostTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsStatsdHostTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsStatsdHostTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSustainedPerformanceHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSustainedPerformanceHostTestCases
index 88c4ae8..04fec34 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSustainedPerformanceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSustainedPerformanceHostTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsSustainedPerformanceHostTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsSustainedPerformanceHostTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSustainedPerformanceHostTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSync b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSync
index 34dda1c..4cb1178 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSync
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSync
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsSync',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsSync',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSyncAccountAccessOtherCertTestCases', '--include-filter', 'CtsSyncContentHostTestCases', '--include-filter', 'CtsSyncManagerTestsCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSystem b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSystem
index 327d95a..17a57a5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSystem
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSystem
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsSystem',
         test_name='cheets_CTS_P.9.0_r11.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'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsTelecom b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsTelecom
index 5da4e6e..c665094 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsTelecom
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsTelecom
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsTelecom',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsTelecom',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTelecomTestCases', '--include-filter', 'CtsTelecomTestCases2', '--include-filter', 'CtsTelecomTestCases3', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsTelephony b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsTelephony
index a44cb70..fba6bd1 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsTelephony
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsTelephony
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsTelephony',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsTelephony',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTelephony2TestCases', '--include-filter', 'CtsTelephonyTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsTextTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsTextTestCases
index cf1d3e7..6f69baa 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsTextTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsTextTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsTextTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsTextTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsTextTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsTheme b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsTheme
index 09b70e2..fcfcb8b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsTheme
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsTheme
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsTheme',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsTheme',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsThemeDeviceTestCases', '--include-filter', 'CtsThemeHostTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsToast b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsToast
index b04cef0..249732c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsToast
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsToast
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsToast',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsToast',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsToastLegacyTestCases', '--include-filter', 'CtsToastTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsTransitionTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsTransitionTestCases
index 18f3f14..c8cce19 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsTransitionTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsTransitionTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsTransitionTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsTransitionTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsTransitionTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsTrustedVoiceHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsTrustedVoiceHostTestCases
index 1c0ac94..cbcaec2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsTrustedVoiceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsTrustedVoiceHostTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsTrustedVoiceHostTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsTrustedVoiceHostTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsTrustedVoiceHostTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsTv b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsTv
index 06cdebc..21ef967 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsTv
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsTv
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsTv',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsTv',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTvProviderTestCases', '--include-filter', 'CtsTvTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsUi b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsUi
index 46edcce..a4bdf67 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsUi
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsUi
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsUi',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsUi',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUiAutomationTestCases', '--include-filter', 'CtsUiDeviceTestCases', '--include-filter', 'CtsUiRenderingTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsUidIsolationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsUidIsolationTestCases
index dd8eec2..b8f5e41 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsUidIsolationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsUidIsolationTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsUidIsolationTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsUidIsolationTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsUidIsolationTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsUsageStatsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsUsageStatsTestCases
index 1293a5f..5f1a428 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsUsageStatsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsUsageStatsTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsUsageStatsTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsUsageStatsTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsUsageStatsTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsUsbTests b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsUsbTests
index 5871eda..67a1317 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsUsbTests
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsUsbTests
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsUsbTests',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsUsbTests',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsUsbTests', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsUtilTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsUtilTestCases
index 22152e7..ef84173 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsUtilTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsUtilTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsUtilTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsUtilTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsUtilTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsVideoTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsVideoTestCases
index 12b50c2..03b1775 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsVideoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsVideoTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsVideoTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsVideoTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsVideoTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsViewTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsViewTestCases
index 66f0a94..3ab05e5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsViewTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsViewTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsViewTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsViewTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsViewTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsViewTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsViewTestCases',
         target_plan=None,
         bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsVmTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsVmTestCases
index b35745d..0670055 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsVmTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsVmTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsVmTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsVmTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsVmTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsVoice b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsVoice
index 4d526ed..6fc0a06 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsVoice
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsVoice
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsVoice',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsVoice',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsVoiceInteractionTestCases', '--include-filter', 'CtsVoiceSettingsTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsVrTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsVrTestCases
index 61d65a0..3677492 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsVrTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsVrTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsVrTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsVrTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsVrTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsWebkitTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsWebkitTestCases
index b725a48..0639355 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsWebkitTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsWebkitTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsWebkitTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsWebkitTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsWebkitTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsWidgetTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsWidgetTestCases
index f3c28d1..b705113 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsWidgetTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsWidgetTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsWidgetTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsWidgetTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsWidgetTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsWindowManagerDeviceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsWindowManagerDeviceTestCases
index 07ea588..2addc7d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsWindowManagerDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsWindowManagerDeviceTestCases
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsWindowManagerDeviceTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsWindowManagerDeviceTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsWindowManagerDeviceTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsWrap b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsWrap
index 76dab94..6a23cab 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsWrap
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsWrap
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.CtsWrap',
         test_name='cheets_CTS_P.9.0_r11.x86.CtsWrap',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsWrapNoWrapTestCases', '--include-filter', 'CtsWrapWrapDebugMallocDebugTestCases', '--include-filter', 'CtsWrapWrapDebugTestCases', '--include-filter', 'CtsWrapWrapNoDebugTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases
index e719733..e66bade 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases
@@ -23,8 +23,8 @@
         max_retry=9,
         tag='9.0_r11.x86.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAbiOverrideHostTestCases', '--include-filter', 'CtsAccelerationTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
         target_plan=None,
         bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases
index 9b94656..96f5f35 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases
@@ -23,8 +23,8 @@
         max_retry=9,
         tag='9.0_r11.x86.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAccessibilityServiceTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
         target_plan=None,
         bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases
index a32f952..cab26b1 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases
@@ -23,8 +23,8 @@
         max_retry=9,
         tag='9.0_r11.x86.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAccessibilityTestCases', '--include-filter', 'CtsAccountManagerTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
         target_plan=None,
         bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases
index cc052a0..e6651dd 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases
@@ -23,8 +23,8 @@
         max_retry=9,
         tag='9.0_r11.x86.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsActivityManagerDeviceSdk25TestCases', '--include-filter', 'CtsActivityManagerDeviceTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
         target_plan=None,
         bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases
index 37f7f75..951679b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases
@@ -24,8 +24,8 @@
         enable_default_apps=True,
         tag='9.0_r11.x86.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases',
         test_name='cheets_CTS_P.9.0_r11.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'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
         target_plan=None,
         bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases
index 76f620f..47e0375 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases
@@ -23,8 +23,8 @@
         max_retry=15,
         tag='9.0_r11.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDeqpTestCases'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDeqpTestCases', '--dynamic-config-url='],
+        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsDeqpTestCases_-_CtsDeqpTestCases',
         target_plan=None,
         bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases
index a6fd11d..179ad5f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases
@@ -23,8 +23,8 @@
         max_retry=9,
         tag='9.0_r11.x86.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases',
         test_name='cheets_CTS_P.9.0_r11.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'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
         target_plan=None,
         bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
index 433e7db..6fdb704 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
@@ -23,8 +23,8 @@
         max_retry=9,
         tag='9.0_r11.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsFileSystemTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
         target_plan=None,
         bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases
index 480e63e..13eb9f2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases
@@ -23,8 +23,8 @@
         max_retry=9,
         tag='9.0_r11.x86.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases',
         test_name='cheets_CTS_P.9.0_r11.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'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
         target_plan=None,
         bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases
index 81b0297..b3cbcc3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases
@@ -23,8 +23,8 @@
         max_retry=9,
         tag='9.0_r11.x86.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaHostTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
         target_plan=None,
         bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases
index 07757df..849d88b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases
@@ -23,8 +23,8 @@
         max_retry=9,
         tag='9.0_r11.x86.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases',
         test_name='cheets_CTS_P.9.0_r11.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'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
         target_plan=None,
         bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases
index 6d8d556..da1f263 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases
@@ -23,8 +23,8 @@
         max_retry=9,
         tag='9.0_r11.x86.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSecurityHostTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
         target_plan=None,
         bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases
index b3fbd91..b723b76 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases
@@ -23,8 +23,8 @@
         max_retry=9,
         tag='9.0_r11.x86.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecurityTestCases', '--include-filter', 'CtsSelinuxTargetSdk25TestCases', '--include-filter', 'CtsSelinuxTargetSdk27TestCases', '--include-filter', 'CtsSelinuxTargetSdkCurrentTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
         target_plan=None,
         bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsSensorTestCases_-_CtsSensorTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsSensorTestCases_-_CtsSensorTestCases
index 3e1f258..8c388b7 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsSensorTestCases_-_CtsSensorTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsSensorTestCases_-_CtsSensorTestCases
@@ -23,8 +23,8 @@
         max_retry=30,
         tag='9.0_r11.x86.all.CtsSensorTestCases_-_CtsSensorTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.all.CtsSensorTestCases_-_CtsSensorTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSensorTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
         target_plan=None,
         bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsShortcutHostTestCases_-_CtsVideoTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsShortcutHostTestCases_-_CtsVideoTestCases
index ded8bae..a11b586 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsShortcutHostTestCases_-_CtsVideoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsShortcutHostTestCases_-_CtsVideoTestCases
@@ -23,8 +23,8 @@
         max_retry=9,
         tag='9.0_r11.x86.all.CtsShortcutHostTestCases_-_CtsVideoTestCases',
         test_name='cheets_CTS_P.9.0_r11.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'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
         target_plan=None,
         bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsViewTestCases_-_CtsViewTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsViewTestCases_-_CtsViewTestCases
index 7e47984..8bc6894 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsViewTestCases_-_CtsViewTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsViewTestCases_-_CtsViewTestCases
@@ -23,8 +23,8 @@
         max_retry=9,
         tag='9.0_r11.x86.all.CtsViewTestCases_-_CtsViewTestCases',
         test_name='cheets_CTS_P.9.0_r11.x86.all.CtsViewTestCases_-_CtsViewTestCases',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsViewTestCases', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsViewTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsViewTestCases_-_CtsViewTestCases',
         target_plan=None,
         bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsVmTestCases_-_vm-tests-tf b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsVmTestCases_-_vm-tests-tf
index 9b7fe44..5c387ea 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsVmTestCases_-_vm-tests-tf
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsVmTestCases_-_vm-tests-tf
@@ -23,8 +23,8 @@
         max_retry=9,
         tag='9.0_r11.x86.all.CtsVmTestCases_-_vm-tests-tf',
         test_name='cheets_CTS_P.9.0_r11.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'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
         target_plan=None,
         bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.cts-system-all.api b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.cts-system-all.api
index 62c31e1..597d3d6 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.cts-system-all.api
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.cts-system-all.api
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.cts-system-all.api',
         test_name='cheets_CTS_P.9.0_r11.x86.cts-system-all.api',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'cts-system-all.api', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.signed-CtsSecureElementAccessControl b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.signed-CtsSecureElementAccessControl
index ff99b07..b54d0e8 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.signed-CtsSecureElementAccessControl
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.signed-CtsSecureElementAccessControl
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.signed-CtsSecureElementAccessControl',
         test_name='cheets_CTS_P.9.0_r11.x86.signed-CtsSecureElementAccessControl',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases1', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases2', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases3', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.tradefed-run-collect-tests-only-internal b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.tradefed-run-collect-tests-only-internal
index 7bd7e9b..fe9dce1 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.tradefed-run-collect-tests-only-internal
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.tradefed-run-collect-tests-only-internal
@@ -23,7 +23,7 @@
         max_retry=0,
         tag='9.0_r11.x86.tradefed-run-collect-tests-only-internal',
         test_name='cheets_CTS_P.9.0_r11.x86.tradefed-run-collect-tests-only-internal',
-        run_template=['run', 'commandAndExit', 'collect-tests-only', '--disable-reboot', '--module-arg', 'CtsMediaTestCases:skip-media-download:true', '--module-arg', 'CtsMediaStressTestCases:skip-media-download:true', '--module-arg', 'CtsMediaBitstreamsTestCases:skip-media-download:true'],
+        run_template=['run', 'commandAndExit', 'collect-tests-only', '--disable-reboot', '--module-arg', 'CtsMediaTestCases:skip-media-download:true', '--module-arg', 'CtsMediaStressTestCases:skip-media-download:true', '--module-arg', 'CtsMediaBitstreamsTestCases:skip-media-download:true', '--dynamic-config-url='],
         retry_template=None,
         target_module=None,
         target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.vm-tests-tf b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.vm-tests-tf
index 2881813..9cc4f70 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.vm-tests-tf
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.vm-tests-tf
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.vm-tests-tf',
         test_name='cheets_CTS_P.9.0_r11.x86.vm-tests-tf',
-        run_template=['run', 'commandAndExit', 'cts', '--module', 'vm-tests-tf', '--logcat-on-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.wm-presubmit b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.wm-presubmit
index 78ad80e..5765b5f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.wm-presubmit
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.wm-presubmit
@@ -22,8 +22,8 @@
         iterations=1,
         tag='9.0_r11.x86.wm-presubmit',
         test_name='cheets_CTS_P.9.0_r11.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'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+        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',
         target_plan=None,
         bundle='x86',