diff --git a/server/site_tests/cheets_GTS/cheets_GTS.py b/server/site_tests/cheets_GTS/cheets_GTS.py
index ecfe6de..d6141b3 100644
--- a/server/site_tests/cheets_GTS/cheets_GTS.py
+++ b/server/site_tests/cheets_GTS/cheets_GTS.py
@@ -23,7 +23,7 @@
 # Maximum default time allowed for each individual GTS module.
 _GTS_TIMEOUT_SECONDS = 3600
 _PARTNER_GTS_BUCKET = 'gs://chromeos-partner-gts/'
-_PARTNER_GTS_LOCATION = _PARTNER_GTS_BUCKET + 'gts-7_r5-6497315.zip'
+_PARTNER_GTS_LOCATION = _PARTNER_GTS_BUCKET + 'gts-8_r1-6720564.zip'
 _PARTNER_GTS_AUTHKEY = _PARTNER_GTS_BUCKET + 'gts-arc.json'
 _GTS_MEDIA_URI = ('https://storage.googleapis.com/youtube-test-media/gts/' +
                   'GtsYouTubeTestCases-media-1.2.zip')
diff --git a/server/site_tests/cheets_GTS/control.GtsAccountsHostTestCases b/server/site_tests/cheets_GTS/control.GtsAccountsHostTestCases
index 2388faf..5ccbabb 100644
--- a/server/site_tests/cheets_GTS/control.GtsAccountsHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsAccountsHostTestCases
@@ -28,6 +28,7 @@
         target_module='GtsAccountsHostTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsAdminTestCases b/server/site_tests/cheets_GTS/control.GtsAdminTestCases
index 1ff4e79..94fc116 100644
--- a/server/site_tests/cheets_GTS/control.GtsAdminTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsAdminTestCases
@@ -28,6 +28,7 @@
         target_module='GtsAdminTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsAfwTestCases b/server/site_tests/cheets_GTS/control.GtsAfwTestCases
index fd6cf46..5334947 100644
--- a/server/site_tests/cheets_GTS/control.GtsAfwTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsAfwTestCases
@@ -28,6 +28,7 @@
         target_module='GtsAfwTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsAndroidAutoDeviceTestCases b/server/site_tests/cheets_GTS/control.GtsAndroidAutoDeviceTestCases
index a73a5a2..2c23763 100644
--- a/server/site_tests/cheets_GTS/control.GtsAndroidAutoDeviceTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsAndroidAutoDeviceTestCases
@@ -28,6 +28,7 @@
         target_module='GtsAndroidAutoDeviceTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsAppBlacklistDeviceTestCases b/server/site_tests/cheets_GTS/control.GtsAppBlacklistDeviceTestCases
index 488a0c3..788a4b7 100644
--- a/server/site_tests/cheets_GTS/control.GtsAppBlacklistDeviceTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsAppBlacklistDeviceTestCases
@@ -28,6 +28,7 @@
         target_module='GtsAppBlacklistDeviceTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsAppTestCases b/server/site_tests/cheets_GTS/control.GtsAppTestCases
index 702b5bc..dab852a 100644
--- a/server/site_tests/cheets_GTS/control.GtsAppTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsAppTestCases
@@ -28,6 +28,7 @@
         target_module='GtsAppTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsArtManagerHostTestCases b/server/site_tests/cheets_GTS/control.GtsArtManagerHostTestCases
index 8e045ca..94fdb5e 100644
--- a/server/site_tests/cheets_GTS/control.GtsArtManagerHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsArtManagerHostTestCases
@@ -28,6 +28,7 @@
         target_module='GtsArtManagerHostTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsAssistIntentTestCases b/server/site_tests/cheets_GTS/control.GtsAssistIntentTestCases
index 4258698..f2996c7 100644
--- a/server/site_tests/cheets_GTS/control.GtsAssistIntentTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsAssistIntentTestCases
@@ -28,6 +28,7 @@
         target_module='GtsAssistIntentTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsAssistantHostTestCases b/server/site_tests/cheets_GTS/control.GtsAssistantHostTestCases
index 1f71a54..04d9e0f 100644
--- a/server/site_tests/cheets_GTS/control.GtsAssistantHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsAssistantHostTestCases
@@ -28,6 +28,7 @@
         target_module='GtsAssistantHostTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases b/server/site_tests/cheets_GTS/control.GtsAssistantMicHostTestCases
similarity index 67%
copy from server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases
copy to server/site_tests/cheets_GTS/control.GtsAssistantMicHostTestCases
index b9585f8..817da7f 100644
--- a/server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsAssistantMicHostTestCases
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsGameDeviceHostTestCases'
+NAME = 'cheets_GTS.GtsAssistantMicHostTestCases'
 ATTRIBUTES = 'suite:gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsGameDeviceHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
+DOC = 'Run module GtsAssistantMicHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
 
 def run_TS(machine):
     host_list = [hosts.create_host(machine)]
@@ -21,13 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=2,
-        tag='GtsGameDeviceHostTestCases',
-        test_name='cheets_GTS.GtsGameDeviceHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsGameDeviceHostTestCases', '--ignore-business-logic-failure'],
+        tag='GtsAssistantMicHostTestCases',
+        test_name='cheets_GTS.GtsAssistantMicHostTestCases',
+        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAssistantMicHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsGameDeviceHostTestCases',
+        target_module='GtsAssistantMicHostTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases b/server/site_tests/cheets_GTS/control.GtsAudioTestCases
similarity index 69%
copy from server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases
copy to server/site_tests/cheets_GTS/control.GtsAudioTestCases
index b9585f8..5c973b3 100644
--- a/server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsAudioTestCases
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsGameDeviceHostTestCases'
+NAME = 'cheets_GTS.GtsAudioTestCases'
 ATTRIBUTES = 'suite:gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsGameDeviceHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
+DOC = 'Run module GtsAudioTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
 
 def run_TS(machine):
     host_list = [hosts.create_host(machine)]
@@ -21,13 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=2,
-        tag='GtsGameDeviceHostTestCases',
-        test_name='cheets_GTS.GtsGameDeviceHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsGameDeviceHostTestCases', '--ignore-business-logic-failure'],
+        tag='GtsAudioTestCases',
+        test_name='cheets_GTS.GtsAudioTestCases',
+        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsAudioTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsGameDeviceHostTestCases',
+        target_module='GtsAudioTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsBackupHostTestCases b/server/site_tests/cheets_GTS/control.GtsBackupHostTestCases
index 6268603..ab18fb5 100644
--- a/server/site_tests/cheets_GTS/control.GtsBackupHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsBackupHostTestCases
@@ -28,6 +28,7 @@
         target_module='GtsBackupHostTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsBackupTestCases b/server/site_tests/cheets_GTS/control.GtsBackupTestCases
index 792c69b..ddbda21 100644
--- a/server/site_tests/cheets_GTS/control.GtsBackupTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsBackupTestCases
@@ -28,6 +28,7 @@
         target_module='GtsBackupTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsBootStatsTestCases b/server/site_tests/cheets_GTS/control.GtsBootStatsTestCases
index 95ddd89..3b490d2 100644
--- a/server/site_tests/cheets_GTS/control.GtsBootStatsTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsBootStatsTestCases
@@ -28,6 +28,7 @@
         target_module='GtsBootStatsTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsCallLogTestCases b/server/site_tests/cheets_GTS/control.GtsCallLogTestCases
index da67283..50aef7b 100644
--- a/server/site_tests/cheets_GTS/control.GtsCallLogTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsCallLogTestCases
@@ -28,6 +28,7 @@
         target_module='GtsCallLogTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsCameraTestCases b/server/site_tests/cheets_GTS/control.GtsCameraTestCases
index bbedfdf..e02ad83 100644
--- a/server/site_tests/cheets_GTS/control.GtsCameraTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsCameraTestCases
@@ -28,6 +28,7 @@
         target_module='GtsCameraTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsCastHostTestCases b/server/site_tests/cheets_GTS/control.GtsCastHostTestCases
index e95d2c4..a4aa291 100644
--- a/server/site_tests/cheets_GTS/control.GtsCastHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsCastHostTestCases
@@ -28,6 +28,7 @@
         target_module='GtsCastHostTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsContactsAppDeviceTestCases b/server/site_tests/cheets_GTS/control.GtsContactsAppDeviceTestCases
index 12f0ae1..5f17a8a 100644
--- a/server/site_tests/cheets_GTS/control.GtsContactsAppDeviceTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsContactsAppDeviceTestCases
@@ -28,6 +28,7 @@
         target_module='GtsContactsAppDeviceTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsContactsTest b/server/site_tests/cheets_GTS/control.GtsContactsTest
index 0ee17de..e25dea3 100644
--- a/server/site_tests/cheets_GTS/control.GtsContactsTest
+++ b/server/site_tests/cheets_GTS/control.GtsContactsTest
@@ -28,6 +28,7 @@
         target_module='GtsContactsTest',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases b/server/site_tests/cheets_GTS/control.GtsContentHostTestCases
similarity index 68%
copy from server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases
copy to server/site_tests/cheets_GTS/control.GtsContentHostTestCases
index b9585f8..e20e8d9 100644
--- a/server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsContentHostTestCases
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsGameDeviceHostTestCases'
+NAME = 'cheets_GTS.GtsContentHostTestCases'
 ATTRIBUTES = 'suite:gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsGameDeviceHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
+DOC = 'Run module GtsContentHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
 
 def run_TS(machine):
     host_list = [hosts.create_host(machine)]
@@ -21,13 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=2,
-        tag='GtsGameDeviceHostTestCases',
-        test_name='cheets_GTS.GtsGameDeviceHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsGameDeviceHostTestCases', '--ignore-business-logic-failure'],
+        tag='GtsContentHostTestCases',
+        test_name='cheets_GTS.GtsContentHostTestCases',
+        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsContentHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsGameDeviceHostTestCases',
+        target_module='GtsContentHostTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsContentTestCases b/server/site_tests/cheets_GTS/control.GtsContentTestCases
index 1261065..5e2a1ea 100644
--- a/server/site_tests/cheets_GTS/control.GtsContentTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsContentTestCases
@@ -28,6 +28,7 @@
         target_module='GtsContentTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases b/server/site_tests/cheets_GTS/control.GtsContextHubPermissionDeviceTestCases
similarity index 64%
copy from server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases
copy to server/site_tests/cheets_GTS/control.GtsContextHubPermissionDeviceTestCases
index b9585f8..7793f3b 100644
--- a/server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsContextHubPermissionDeviceTestCases
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsGameDeviceHostTestCases'
+NAME = 'cheets_GTS.GtsContextHubPermissionDeviceTestCases'
 ATTRIBUTES = 'suite:gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsGameDeviceHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
+DOC = 'Run module GtsContextHubPermissionDeviceTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
 
 def run_TS(machine):
     host_list = [hosts.create_host(machine)]
@@ -21,13 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=2,
-        tag='GtsGameDeviceHostTestCases',
-        test_name='cheets_GTS.GtsGameDeviceHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsGameDeviceHostTestCases', '--ignore-business-logic-failure'],
+        tag='GtsContextHubPermissionDeviceTestCases',
+        test_name='cheets_GTS.GtsContextHubPermissionDeviceTestCases',
+        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsContextHubPermissionDeviceTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsGameDeviceHostTestCases',
+        target_module='GtsContextHubPermissionDeviceTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases b/server/site_tests/cheets_GTS/control.GtsDebugfsMountTestCases
similarity index 68%
copy from server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases
copy to server/site_tests/cheets_GTS/control.GtsDebugfsMountTestCases
index b9585f8..cc7710a 100644
--- a/server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsDebugfsMountTestCases
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsGameDeviceHostTestCases'
+NAME = 'cheets_GTS.GtsDebugfsMountTestCases'
 ATTRIBUTES = 'suite:gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsGameDeviceHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
+DOC = 'Run module GtsDebugfsMountTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
 
 def run_TS(machine):
     host_list = [hosts.create_host(machine)]
@@ -21,13 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=2,
-        tag='GtsGameDeviceHostTestCases',
-        test_name='cheets_GTS.GtsGameDeviceHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsGameDeviceHostTestCases', '--ignore-business-logic-failure'],
+        tag='GtsDebugfsMountTestCases',
+        test_name='cheets_GTS.GtsDebugfsMountTestCases',
+        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsDebugfsMountTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsGameDeviceHostTestCases',
+        target_module='GtsDebugfsMountTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsDeviceConfigTestCases b/server/site_tests/cheets_GTS/control.GtsDeviceConfigTestCases
index 430d2cc..1247ce7 100644
--- a/server/site_tests/cheets_GTS/control.GtsDeviceConfigTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsDeviceConfigTestCases
@@ -28,6 +28,7 @@
         target_module='GtsDeviceConfigTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsDexModuleRegistrationTestCases b/server/site_tests/cheets_GTS/control.GtsDexModuleRegistrationTestCases
index b2bcf93..db57da4 100644
--- a/server/site_tests/cheets_GTS/control.GtsDexModuleRegistrationTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsDexModuleRegistrationTestCases
@@ -28,6 +28,7 @@
         target_module='GtsDexModuleRegistrationTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases b/server/site_tests/cheets_GTS/control.GtsDialerAudioTestCases
similarity index 68%
copy from server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases
copy to server/site_tests/cheets_GTS/control.GtsDialerAudioTestCases
index b9585f8..379a86b 100644
--- a/server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsDialerAudioTestCases
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsGameDeviceHostTestCases'
+NAME = 'cheets_GTS.GtsDialerAudioTestCases'
 ATTRIBUTES = 'suite:gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsGameDeviceHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
+DOC = 'Run module GtsDialerAudioTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
 
 def run_TS(machine):
     host_list = [hosts.create_host(machine)]
@@ -21,13 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=2,
-        tag='GtsGameDeviceHostTestCases',
-        test_name='cheets_GTS.GtsGameDeviceHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsGameDeviceHostTestCases', '--ignore-business-logic-failure'],
+        tag='GtsDialerAudioTestCases',
+        test_name='cheets_GTS.GtsDialerAudioTestCases',
+        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsDialerAudioTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsGameDeviceHostTestCases',
+        target_module='GtsDialerAudioTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsDialerDeviceTestCases b/server/site_tests/cheets_GTS/control.GtsDialerDeviceTestCases
index 307cfcd..b0a9479 100644
--- a/server/site_tests/cheets_GTS/control.GtsDialerDeviceTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsDialerDeviceTestCases
@@ -28,6 +28,7 @@
         target_module='GtsDialerDeviceTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsDozeDeviceTestCases b/server/site_tests/cheets_GTS/control.GtsDozeDeviceTestCases
index d254220..7ab4be7 100644
--- a/server/site_tests/cheets_GTS/control.GtsDozeDeviceTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsDozeDeviceTestCases
@@ -28,6 +28,7 @@
         target_module='GtsDozeDeviceTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsEdiHostTestCases b/server/site_tests/cheets_GTS/control.GtsEdiHostTestCases
index cd7410e..4dcca56 100644
--- a/server/site_tests/cheets_GTS/control.GtsEdiHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsEdiHostTestCases
@@ -28,6 +28,7 @@
         target_module='GtsEdiHostTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsExoPlayerTestCases b/server/site_tests/cheets_GTS/control.GtsExoPlayerTestCases
index 568bff2..d2db0cc 100644
--- a/server/site_tests/cheets_GTS/control.GtsExoPlayerTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsExoPlayerTestCases
@@ -28,6 +28,7 @@
         target_module='GtsExoPlayerTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=5400)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsFeaturesTestCases b/server/site_tests/cheets_GTS/control.GtsFeaturesTestCases
index a021da1..55e8c9a 100644
--- a/server/site_tests/cheets_GTS/control.GtsFeaturesTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsFeaturesTestCases
@@ -28,6 +28,7 @@
         target_module='GtsFeaturesTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsGmscoreHostTestCases b/server/site_tests/cheets_GTS/control.GtsGmscoreHostTestCases
index 54bf06e..8626c73 100644
--- a/server/site_tests/cheets_GTS/control.GtsGmscoreHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsGmscoreHostTestCases
@@ -28,6 +28,7 @@
         target_module='GtsGmscoreHostTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=3600)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsGraphicsHostTestCases b/server/site_tests/cheets_GTS/control.GtsGraphicsHostTestCases
index 7d7b3ae..69a03f9 100644
--- a/server/site_tests/cheets_GTS/control.GtsGraphicsHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsGraphicsHostTestCases
@@ -28,6 +28,7 @@
         target_module='GtsGraphicsHostTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsHomeHostTestCases b/server/site_tests/cheets_GTS/control.GtsHomeHostTestCases
index f07afc7..e9e6c0b 100644
--- a/server/site_tests/cheets_GTS/control.GtsHomeHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsHomeHostTestCases
@@ -28,6 +28,7 @@
         target_module='GtsHomeHostTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsIncidentConfirmationTestCases b/server/site_tests/cheets_GTS/control.GtsIncidentConfirmationTestCases
index 3fb5274..99ad250 100644
--- a/server/site_tests/cheets_GTS/control.GtsIncidentConfirmationTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsIncidentConfirmationTestCases
@@ -28,6 +28,7 @@
         target_module='GtsIncidentConfirmationTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsIncidentManagerTestCases b/server/site_tests/cheets_GTS/control.GtsIncidentManagerTestCases
index 3f66e7b..b630b98 100644
--- a/server/site_tests/cheets_GTS/control.GtsIncidentManagerTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsIncidentManagerTestCases
@@ -28,6 +28,7 @@
         target_module='GtsIncidentManagerTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases b/server/site_tests/cheets_GTS/control.GtsIncrementalInstallProxyHostTestCases
similarity index 63%
copy from server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases
copy to server/site_tests/cheets_GTS/control.GtsIncrementalInstallProxyHostTestCases
index b9585f8..a9c2ce4 100644
--- a/server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsIncrementalInstallProxyHostTestCases
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsGameDeviceHostTestCases'
+NAME = 'cheets_GTS.GtsIncrementalInstallProxyHostTestCases'
 ATTRIBUTES = 'suite:gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsGameDeviceHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
+DOC = 'Run module GtsIncrementalInstallProxyHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
 
 def run_TS(machine):
     host_list = [hosts.create_host(machine)]
@@ -21,13 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=2,
-        tag='GtsGameDeviceHostTestCases',
-        test_name='cheets_GTS.GtsGameDeviceHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsGameDeviceHostTestCases', '--ignore-business-logic-failure'],
+        tag='GtsIncrementalInstallProxyHostTestCases',
+        test_name='cheets_GTS.GtsIncrementalInstallProxyHostTestCases',
+        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsIncrementalInstallProxyHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsGameDeviceHostTestCases',
+        target_module='GtsIncrementalInstallProxyHostTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases b/server/site_tests/cheets_GTS/control.GtsIncrementalInstallTestCases
similarity index 66%
copy from server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases
copy to server/site_tests/cheets_GTS/control.GtsIncrementalInstallTestCases
index b9585f8..7ae546b 100644
--- a/server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsIncrementalInstallTestCases
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsGameDeviceHostTestCases'
+NAME = 'cheets_GTS.GtsIncrementalInstallTestCases'
 ATTRIBUTES = 'suite:gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsGameDeviceHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
+DOC = 'Run module GtsIncrementalInstallTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
 
 def run_TS(machine):
     host_list = [hosts.create_host(machine)]
@@ -21,13 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=2,
-        tag='GtsGameDeviceHostTestCases',
-        test_name='cheets_GTS.GtsGameDeviceHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsGameDeviceHostTestCases', '--ignore-business-logic-failure'],
+        tag='GtsIncrementalInstallTestCases',
+        test_name='cheets_GTS.GtsIncrementalInstallTestCases',
+        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsIncrementalInstallTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsGameDeviceHostTestCases',
+        target_module='GtsIncrementalInstallTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases b/server/site_tests/cheets_GTS/control.GtsIncrementalInstallTriggerApp
similarity index 66%
copy from server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases
copy to server/site_tests/cheets_GTS/control.GtsIncrementalInstallTriggerApp
index b9585f8..3b43def 100644
--- a/server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsIncrementalInstallTriggerApp
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsGameDeviceHostTestCases'
+NAME = 'cheets_GTS.GtsIncrementalInstallTriggerApp'
 ATTRIBUTES = 'suite:gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsGameDeviceHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
+DOC = 'Run module GtsIncrementalInstallTriggerApp of the Android Google Test Suite (GTS) in the ARC++ container.'
 
 def run_TS(machine):
     host_list = [hosts.create_host(machine)]
@@ -21,13 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=2,
-        tag='GtsGameDeviceHostTestCases',
-        test_name='cheets_GTS.GtsGameDeviceHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsGameDeviceHostTestCases', '--ignore-business-logic-failure'],
+        tag='GtsIncrementalInstallTriggerApp',
+        test_name='cheets_GTS.GtsIncrementalInstallTriggerApp',
+        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsIncrementalInstallTriggerApp', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsGameDeviceHostTestCases',
+        target_module='GtsIncrementalInstallTriggerApp',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsInstallPackagesWhitelistDeviceTestCases b/server/site_tests/cheets_GTS/control.GtsInstallPackagesWhitelistDeviceTestCases
index 33c35c7..c707d1f 100644
--- a/server/site_tests/cheets_GTS/control.GtsInstallPackagesWhitelistDeviceTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsInstallPackagesWhitelistDeviceTestCases
@@ -28,6 +28,7 @@
         target_module='GtsInstallPackagesWhitelistDeviceTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases b/server/site_tests/cheets_GTS/control.GtsInstallerV2TestCases
similarity index 68%
copy from server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases
copy to server/site_tests/cheets_GTS/control.GtsInstallerV2TestCases
index b9585f8..a509225 100644
--- a/server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsInstallerV2TestCases
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsGameDeviceHostTestCases'
+NAME = 'cheets_GTS.GtsInstallerV2TestCases'
 ATTRIBUTES = 'suite:gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsGameDeviceHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
+DOC = 'Run module GtsInstallerV2TestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
 
 def run_TS(machine):
     host_list = [hosts.create_host(machine)]
@@ -21,13 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=2,
-        tag='GtsGameDeviceHostTestCases',
-        test_name='cheets_GTS.GtsGameDeviceHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsGameDeviceHostTestCases', '--ignore-business-logic-failure'],
+        tag='GtsInstallerV2TestCases',
+        test_name='cheets_GTS.GtsInstallerV2TestCases',
+        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsInstallerV2TestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsGameDeviceHostTestCases',
+        target_module='GtsInstallerV2TestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsInstantAppsHostTestCases b/server/site_tests/cheets_GTS/control.GtsInstantAppsHostTestCases
index 42eefb8..5f6c7d5 100644
--- a/server/site_tests/cheets_GTS/control.GtsInstantAppsHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsInstantAppsHostTestCases
@@ -28,6 +28,7 @@
         target_module='GtsInstantAppsHostTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsLargeApkHostTestCases b/server/site_tests/cheets_GTS/control.GtsLargeApkHostTestCases
index 06f1b52..c3a3172 100644
--- a/server/site_tests/cheets_GTS/control.GtsLargeApkHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsLargeApkHostTestCases
@@ -28,6 +28,7 @@
         target_module='GtsLargeApkHostTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases b/server/site_tests/cheets_GTS/control.GtsLinkerConfigTestCases
similarity index 68%
copy from server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases
copy to server/site_tests/cheets_GTS/control.GtsLinkerConfigTestCases
index b9585f8..1eadd96 100644
--- a/server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsLinkerConfigTestCases
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsGameDeviceHostTestCases'
+NAME = 'cheets_GTS.GtsLinkerConfigTestCases'
 ATTRIBUTES = 'suite:gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsGameDeviceHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
+DOC = 'Run module GtsLinkerConfigTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
 
 def run_TS(machine):
     host_list = [hosts.create_host(machine)]
@@ -21,13 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=2,
-        tag='GtsGameDeviceHostTestCases',
-        test_name='cheets_GTS.GtsGameDeviceHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsGameDeviceHostTestCases', '--ignore-business-logic-failure'],
+        tag='GtsLinkerConfigTestCases',
+        test_name='cheets_GTS.GtsLinkerConfigTestCases',
+        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsLinkerConfigTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsGameDeviceHostTestCases',
+        target_module='GtsLinkerConfigTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases "b/server/site_tests/cheets_GTS/control.GtsLinkerConfigTestCases\133secondary_user\135"
similarity index 63%
copy from server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases
copy to "server/site_tests/cheets_GTS/control.GtsLinkerConfigTestCases\133secondary_user\135"
index b9585f8..fa43a01 100644
--- a/server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases
+++ "b/server/site_tests/cheets_GTS/control.GtsLinkerConfigTestCases\133secondary_user\135"
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsGameDeviceHostTestCases'
+NAME = 'cheets_GTS.GtsLinkerConfigTestCases[secondary_user]'
 ATTRIBUTES = 'suite:gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsGameDeviceHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
+DOC = 'Run module GtsLinkerConfigTestCases[secondary_user] of the Android Google Test Suite (GTS) in the ARC++ container.'
 
 def run_TS(machine):
     host_list = [hosts.create_host(machine)]
@@ -21,13 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=2,
-        tag='GtsGameDeviceHostTestCases',
-        test_name='cheets_GTS.GtsGameDeviceHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsGameDeviceHostTestCases', '--ignore-business-logic-failure'],
+        tag='GtsLinkerConfigTestCases[secondary_user]',
+        test_name='cheets_GTS.GtsLinkerConfigTestCases[secondary_user]',
+        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsLinkerConfigTestCases[secondary_user]', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsGameDeviceHostTestCases',
+        target_module='GtsLinkerConfigTestCases[secondary_user]',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsLocationHostTestCases b/server/site_tests/cheets_GTS/control.GtsLocationHostTestCases
index ccf6c5f..c8d5757 100644
--- a/server/site_tests/cheets_GTS/control.GtsLocationHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsLocationHostTestCases
@@ -28,6 +28,7 @@
         target_module='GtsLocationHostTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsLocationTestCases b/server/site_tests/cheets_GTS/control.GtsLocationTestCases
index 0f08a5c..2b922a1 100644
--- a/server/site_tests/cheets_GTS/control.GtsLocationTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsLocationTestCases
@@ -28,6 +28,7 @@
         target_module='GtsLocationTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsMediaTestCases b/server/site_tests/cheets_GTS/control.GtsMediaTestCases
index 656c69b..6ab6379 100644
--- a/server/site_tests/cheets_GTS/control.GtsMediaTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsMediaTestCases
@@ -29,6 +29,7 @@
         target_module='GtsMediaTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=14400)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsMemoryHostTestCases b/server/site_tests/cheets_GTS/control.GtsMemoryHostTestCases
index 0285f44..35dee583 100644
--- a/server/site_tests/cheets_GTS/control.GtsMemoryHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsMemoryHostTestCases
@@ -28,6 +28,7 @@
         target_module='GtsMemoryHostTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsMemoryTestCases b/server/site_tests/cheets_GTS/control.GtsMemoryTestCases
index 76fe2da..fc4c437 100644
--- a/server/site_tests/cheets_GTS/control.GtsMemoryTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsMemoryTestCases
@@ -28,6 +28,7 @@
         target_module='GtsMemoryTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsModuleMetadataTestCases b/server/site_tests/cheets_GTS/control.GtsModuleMetadataTestCases
index 13026c4..3493dab 100644
--- a/server/site_tests/cheets_GTS/control.GtsModuleMetadataTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsModuleMetadataTestCases
@@ -28,6 +28,7 @@
         target_module='GtsModuleMetadataTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsNetStatsHostTestCases b/server/site_tests/cheets_GTS/control.GtsNetStatsHostTestCases
index a1fb0af..4da51f0 100644
--- a/server/site_tests/cheets_GTS/control.GtsNetStatsHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsNetStatsHostTestCases
@@ -28,6 +28,7 @@
         target_module='GtsNetStatsHostTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsNetTestCases b/server/site_tests/cheets_GTS/control.GtsNetTestCases
index 34255d3..3b2bdd5 100644
--- a/server/site_tests/cheets_GTS/control.GtsNetTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsNetTestCases
@@ -28,6 +28,7 @@
         target_module='GtsNetTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsNetworkStackHostTestCases b/server/site_tests/cheets_GTS/control.GtsNetworkStackHostTestCases
index e0f20a9..ca74a4a 100644
--- a/server/site_tests/cheets_GTS/control.GtsNetworkStackHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsNetworkStackHostTestCases
@@ -28,6 +28,7 @@
         target_module='GtsNetworkStackHostTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsNetworkWatchlistTestCases b/server/site_tests/cheets_GTS/control.GtsNetworkWatchlistTestCases
index 4cf6489..033b61d 100644
--- a/server/site_tests/cheets_GTS/control.GtsNetworkWatchlistTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsNetworkWatchlistTestCases
@@ -28,6 +28,7 @@
         target_module='GtsNetworkWatchlistTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsNmgiarcTestCases b/server/site_tests/cheets_GTS/control.GtsNmgiarcTestCases
index 7948b61..b61c34c 100644
--- a/server/site_tests/cheets_GTS/control.GtsNmgiarcTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsNmgiarcTestCases
@@ -28,6 +28,7 @@
         target_module='GtsNmgiarcTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsNoPermissionTestCases b/server/site_tests/cheets_GTS/control.GtsNoPermissionTestCases
index 3133a34..ce5060d 100644
--- a/server/site_tests/cheets_GTS/control.GtsNoPermissionTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsNoPermissionTestCases
@@ -28,6 +28,7 @@
         target_module='GtsNoPermissionTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsNoPermissionTestCases25 b/server/site_tests/cheets_GTS/control.GtsNoPermissionTestCases25
index 26d2e3f..7b6ec57 100644
--- a/server/site_tests/cheets_GTS/control.GtsNoPermissionTestCases25
+++ b/server/site_tests/cheets_GTS/control.GtsNoPermissionTestCases25
@@ -28,6 +28,7 @@
         target_module='GtsNoPermissionTestCases25',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsNotificationTestCases b/server/site_tests/cheets_GTS/control.GtsNotificationTestCases
index e14df8e..1b663b0 100644
--- a/server/site_tests/cheets_GTS/control.GtsNotificationTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsNotificationTestCases
@@ -28,6 +28,7 @@
         target_module='GtsNotificationTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsOemLockServiceTestCases b/server/site_tests/cheets_GTS/control.GtsOemLockServiceTestCases
index 5584afe..0e115a8 100644
--- a/server/site_tests/cheets_GTS/control.GtsOemLockServiceTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsOemLockServiceTestCases
@@ -28,6 +28,7 @@
         target_module='GtsOemLockServiceTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsOsTestCases b/server/site_tests/cheets_GTS/control.GtsOsTestCases
index 8be2811..8147c4a 100644
--- a/server/site_tests/cheets_GTS/control.GtsOsTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsOsTestCases
@@ -28,6 +28,7 @@
         target_module='GtsOsTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsPackageInstallTestCases b/server/site_tests/cheets_GTS/control.GtsPackageInstallTestCases
index c6ed5e8..b0eb161 100644
--- a/server/site_tests/cheets_GTS/control.GtsPackageInstallTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsPackageInstallTestCases
@@ -28,6 +28,7 @@
         target_module='GtsPackageInstallTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsPackageInstallerTapjackingTestCases b/server/site_tests/cheets_GTS/control.GtsPackageInstallerTapjackingTestCases
index e0a21cc..c127601 100644
--- a/server/site_tests/cheets_GTS/control.GtsPackageInstallerTapjackingTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsPackageInstallerTapjackingTestCases
@@ -28,6 +28,7 @@
         target_module='GtsPackageInstallerTapjackingTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsPackageManagerHostTestCases b/server/site_tests/cheets_GTS/control.GtsPackageManagerHostTestCases
index 3317ad5..fcc34d5 100644
--- a/server/site_tests/cheets_GTS/control.GtsPackageManagerHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsPackageManagerHostTestCases
@@ -28,6 +28,7 @@
         target_module='GtsPackageManagerHostTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsPackageNameCertPairsDeviceTestCases b/server/site_tests/cheets_GTS/control.GtsPackageNameCertPairsDeviceTestCases
index f4fdffa..0be8d14 100644
--- a/server/site_tests/cheets_GTS/control.GtsPackageNameCertPairsDeviceTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsPackageNameCertPairsDeviceTestCases
@@ -28,6 +28,7 @@
         target_module='GtsPackageNameCertPairsDeviceTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsPackageUninstallTestCases b/server/site_tests/cheets_GTS/control.GtsPackageUninstallTestCases
index f660b85..e7b43bc 100644
--- a/server/site_tests/cheets_GTS/control.GtsPackageUninstallTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsPackageUninstallTestCases
@@ -28,6 +28,7 @@
         target_module='GtsPackageUninstallTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsPartnerBookmarksTestCases b/server/site_tests/cheets_GTS/control.GtsPartnerBookmarksTestCases
index d0665b3..e43c32a 100644
--- a/server/site_tests/cheets_GTS/control.GtsPartnerBookmarksTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsPartnerBookmarksTestCases
@@ -28,6 +28,7 @@
         target_module='GtsPartnerBookmarksTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsPermissionControllerHostTestCases b/server/site_tests/cheets_GTS/control.GtsPermissionControllerHostTestCases
index 0e2a3b9..aa331eb 100644
--- a/server/site_tests/cheets_GTS/control.GtsPermissionControllerHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsPermissionControllerHostTestCases
@@ -28,6 +28,7 @@
         target_module='GtsPermissionControllerHostTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsPermissionTestCases b/server/site_tests/cheets_GTS/control.GtsPermissionTestCases
index f6ebe03..a968b5d 100644
--- a/server/site_tests/cheets_GTS/control.GtsPermissionTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsPermissionTestCases
@@ -28,6 +28,7 @@
         target_module='GtsPermissionTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsPlacementTestCases b/server/site_tests/cheets_GTS/control.GtsPlacementTestCases
index 34d9f03..3ad25d0 100644
--- a/server/site_tests/cheets_GTS/control.GtsPlacementTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsPlacementTestCases
@@ -28,6 +28,7 @@
         target_module='GtsPlacementTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsPlayAutoInstallTestCases b/server/site_tests/cheets_GTS/control.GtsPlayAutoInstallTestCases
index f2fb6f1..9e150fc 100644
--- a/server/site_tests/cheets_GTS/control.GtsPlayAutoInstallTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsPlayAutoInstallTestCases
@@ -28,6 +28,7 @@
         target_module='GtsPlayAutoInstallTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases b/server/site_tests/cheets_GTS/control.GtsPlayFsiHostTestCases
similarity index 68%
copy from server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases
copy to server/site_tests/cheets_GTS/control.GtsPlayFsiHostTestCases
index b9585f8..f1650fb 100644
--- a/server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsPlayFsiHostTestCases
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsGameDeviceHostTestCases'
+NAME = 'cheets_GTS.GtsPlayFsiHostTestCases'
 ATTRIBUTES = 'suite:gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsGameDeviceHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
+DOC = 'Run module GtsPlayFsiHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
 
 def run_TS(machine):
     host_list = [hosts.create_host(machine)]
@@ -21,13 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=2,
-        tag='GtsGameDeviceHostTestCases',
-        test_name='cheets_GTS.GtsGameDeviceHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsGameDeviceHostTestCases', '--ignore-business-logic-failure'],
+        tag='GtsPlayFsiHostTestCases',
+        test_name='cheets_GTS.GtsPlayFsiHostTestCases',
+        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPlayFsiHostTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsGameDeviceHostTestCases',
+        target_module='GtsPlayFsiHostTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases b/server/site_tests/cheets_GTS/control.GtsPlayFsiTestCases
similarity index 69%
copy from server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases
copy to server/site_tests/cheets_GTS/control.GtsPlayFsiTestCases
index b9585f8..e303914 100644
--- a/server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsPlayFsiTestCases
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsGameDeviceHostTestCases'
+NAME = 'cheets_GTS.GtsPlayFsiTestCases'
 ATTRIBUTES = 'suite:gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsGameDeviceHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
+DOC = 'Run module GtsPlayFsiTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
 
 def run_TS(machine):
     host_list = [hosts.create_host(machine)]
@@ -21,13 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=2,
-        tag='GtsGameDeviceHostTestCases',
-        test_name='cheets_GTS.GtsGameDeviceHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsGameDeviceHostTestCases', '--ignore-business-logic-failure'],
+        tag='GtsPlayFsiTestCases',
+        test_name='cheets_GTS.GtsPlayFsiTestCases',
+        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPlayFsiTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsGameDeviceHostTestCases',
+        target_module='GtsPlayFsiTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsPlayStoreHostTestCases b/server/site_tests/cheets_GTS/control.GtsPlayStoreHostTestCases
index 938c324..50d388d 100644
--- a/server/site_tests/cheets_GTS/control.GtsPlayStoreHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsPlayStoreHostTestCases
@@ -28,6 +28,7 @@
         target_module='GtsPlayStoreHostTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsPrintTestCases b/server/site_tests/cheets_GTS/control.GtsPrintTestCases
index 448bb06..cdca45a 100644
--- a/server/site_tests/cheets_GTS/control.GtsPrintTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsPrintTestCases
@@ -28,6 +28,7 @@
         target_module='GtsPrintTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsPrivacyTestCases b/server/site_tests/cheets_GTS/control.GtsPrivacyTestCases
index 639e952..b312800 100644
--- a/server/site_tests/cheets_GTS/control.GtsPrivacyTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsPrivacyTestCases
@@ -28,6 +28,7 @@
         target_module='GtsPrivacyTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsPrivilegedUpdatePreparer b/server/site_tests/cheets_GTS/control.GtsPrivilegedUpdatePreparer
deleted file mode 100644
index f0f8655..0000000
--- a/server/site_tests/cheets_GTS/control.GtsPrivilegedUpdatePreparer
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsPrivilegedUpdatePreparer'
-ATTRIBUTES = 'suite:gts'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 2
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsPrivilegedUpdatePreparer of the Android Google Test Suite (GTS) in the ARC++ container.'
-
-def run_TS(machine):
-    host_list = [hosts.create_host(machine)]
-    job.run_test(
-        'cheets_GTS',
-        hosts=host_list,
-        iterations=1,
-        max_retry=2,
-        tag='GtsPrivilegedUpdatePreparer',
-        test_name='cheets_GTS.GtsPrivilegedUpdatePreparer',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsPrivilegedUpdatePreparer', '--ignore-business-logic-failure'],
-        retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsPrivilegedUpdatePreparer',
-        target_plan=None,
-        retry_manual_tests=True,
-        warn_on_test_retry=False,
-        timeout=720)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsPropertiesTestCases b/server/site_tests/cheets_GTS/control.GtsPropertiesTestCases
index 0a663f9..fd8e01b 100644
--- a/server/site_tests/cheets_GTS/control.GtsPropertiesTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsPropertiesTestCases
@@ -28,6 +28,7 @@
         target_module='GtsPropertiesTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsRegulationComplianceTestCases b/server/site_tests/cheets_GTS/control.GtsRegulationComplianceTestCases
index 0c37999..5be3653 100644
--- a/server/site_tests/cheets_GTS/control.GtsRegulationComplianceTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsRegulationComplianceTestCases
@@ -28,6 +28,7 @@
         target_module='GtsRegulationComplianceTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsRlzTestCases b/server/site_tests/cheets_GTS/control.GtsRlzTestCases
index a449e05..63fa1e6 100644
--- a/server/site_tests/cheets_GTS/control.GtsRlzTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsRlzTestCases
@@ -28,6 +28,7 @@
         target_module='GtsRlzTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsSampleDeviceTestCases b/server/site_tests/cheets_GTS/control.GtsSampleDeviceTestCases
index 66af664..564cf58 100644
--- a/server/site_tests/cheets_GTS/control.GtsSampleDeviceTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsSampleDeviceTestCases
@@ -28,6 +28,7 @@
         target_module='GtsSampleDeviceTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsSampleDynamicConfigTestCases b/server/site_tests/cheets_GTS/control.GtsSampleDynamicConfigTestCases
index 69906e7..0cb0c07 100644
--- a/server/site_tests/cheets_GTS/control.GtsSampleDynamicConfigTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsSampleDynamicConfigTestCases
@@ -28,6 +28,7 @@
         target_module='GtsSampleDynamicConfigTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsSampleHostTestCases b/server/site_tests/cheets_GTS/control.GtsSampleHostTestCases
index 37b3e85..64adaea 100644
--- a/server/site_tests/cheets_GTS/control.GtsSampleHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsSampleHostTestCases
@@ -28,6 +28,7 @@
         target_module='GtsSampleHostTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsScreenshotHostTestCases b/server/site_tests/cheets_GTS/control.GtsScreenshotHostTestCases
index 3946464..42d797f 100644
--- a/server/site_tests/cheets_GTS/control.GtsScreenshotHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsScreenshotHostTestCases
@@ -28,6 +28,7 @@
         target_module='GtsScreenshotHostTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsSearchHostTestCases b/server/site_tests/cheets_GTS/control.GtsSearchHostTestCases
index 8b6b8e8..1df012f 100644
--- a/server/site_tests/cheets_GTS/control.GtsSearchHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsSearchHostTestCases
@@ -28,6 +28,7 @@
         target_module='GtsSearchHostTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsSecurityHostTestCases b/server/site_tests/cheets_GTS/control.GtsSecurityHostTestCases
index ee51cfa..2565f74 100644
--- a/server/site_tests/cheets_GTS/control.GtsSecurityHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsSecurityHostTestCases
@@ -28,6 +28,7 @@
         target_module='GtsSecurityHostTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsSensorHostTestCases b/server/site_tests/cheets_GTS/control.GtsSensorHostTestCases
index 6606ced..46cb513 100644
--- a/server/site_tests/cheets_GTS/control.GtsSensorHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsSensorHostTestCases
@@ -28,6 +28,7 @@
         target_module='GtsSensorHostTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsSettingsHostTestCases b/server/site_tests/cheets_GTS/control.GtsSettingsHostTestCases
index 070da51..ab2dff8 100644
--- a/server/site_tests/cheets_GTS/control.GtsSettingsHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsSettingsHostTestCases
@@ -28,6 +28,7 @@
         target_module='GtsSettingsHostTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsSettingsTestCases b/server/site_tests/cheets_GTS/control.GtsSettingsTestCases
index 951553b..a19b65c 100644
--- a/server/site_tests/cheets_GTS/control.GtsSettingsTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsSettingsTestCases
@@ -28,6 +28,7 @@
         target_module='GtsSettingsTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsSetupWizardHostTestCases b/server/site_tests/cheets_GTS/control.GtsSetupWizardHostTestCases
index f74bfdc..446e483 100644
--- a/server/site_tests/cheets_GTS/control.GtsSetupWizardHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsSetupWizardHostTestCases
@@ -28,6 +28,7 @@
         target_module='GtsSetupWizardHostTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsSetupWizardNoPermissionTestCases b/server/site_tests/cheets_GTS/control.GtsSetupWizardNoPermissionTestCases
index b13d403..afb3882 100644
--- a/server/site_tests/cheets_GTS/control.GtsSetupWizardNoPermissionTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsSetupWizardNoPermissionTestCases
@@ -28,6 +28,7 @@
         target_module='GtsSetupWizardNoPermissionTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsSimAppDialogTestCases b/server/site_tests/cheets_GTS/control.GtsSimAppDialogTestCases
index a272af3..4d68e3c 100644
--- a/server/site_tests/cheets_GTS/control.GtsSimAppDialogTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsSimAppDialogTestCases
@@ -28,6 +28,7 @@
         target_module='GtsSimAppDialogTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsSmartBatteryDeviceTestCases b/server/site_tests/cheets_GTS/control.GtsSmartBatteryDeviceTestCases
index 272758e..b8f60bf 100644
--- a/server/site_tests/cheets_GTS/control.GtsSmartBatteryDeviceTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsSmartBatteryDeviceTestCases
@@ -28,6 +28,7 @@
         target_module='GtsSmartBatteryDeviceTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases b/server/site_tests/cheets_GTS/control.GtsSmsCallLogTestCases
similarity index 69%
copy from server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases
copy to server/site_tests/cheets_GTS/control.GtsSmsCallLogTestCases
index b9585f8..8d389d5 100644
--- a/server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsSmsCallLogTestCases
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsGameDeviceHostTestCases'
+NAME = 'cheets_GTS.GtsSmsCallLogTestCases'
 ATTRIBUTES = 'suite:gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsGameDeviceHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
+DOC = 'Run module GtsSmsCallLogTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
 
 def run_TS(machine):
     host_list = [hosts.create_host(machine)]
@@ -21,13 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=2,
-        tag='GtsGameDeviceHostTestCases',
-        test_name='cheets_GTS.GtsGameDeviceHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsGameDeviceHostTestCases', '--ignore-business-logic-failure'],
+        tag='GtsSmsCallLogTestCases',
+        test_name='cheets_GTS.GtsSmsCallLogTestCases',
+        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsSmsCallLogTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsGameDeviceHostTestCases',
+        target_module='GtsSmsCallLogTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsSsaidHostTestCases b/server/site_tests/cheets_GTS/control.GtsSsaidHostTestCases
index 7221669..dfcae6c 100644
--- a/server/site_tests/cheets_GTS/control.GtsSsaidHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsSsaidHostTestCases
@@ -28,6 +28,7 @@
         target_module='GtsSsaidHostTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsStagedInstallHostTestCases b/server/site_tests/cheets_GTS/control.GtsStagedInstallHostTestCases
index 5c8df32..d2e088b 100644
--- a/server/site_tests/cheets_GTS/control.GtsStagedInstallHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsStagedInstallHostTestCases
@@ -28,6 +28,7 @@
         target_module='GtsStagedInstallHostTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsStatsdHostTestCases b/server/site_tests/cheets_GTS/control.GtsStatsdHostTestCases
index e44a597..084ae65 100644
--- a/server/site_tests/cheets_GTS/control.GtsStatsdHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsStatsdHostTestCases
@@ -28,6 +28,7 @@
         target_module='GtsStatsdHostTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsStorageTestCases b/server/site_tests/cheets_GTS/control.GtsStorageTestCases
index c4ae810..386cea8 100644
--- a/server/site_tests/cheets_GTS/control.GtsStorageTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsStorageTestCases
@@ -28,6 +28,7 @@
         target_module='GtsStorageTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsSupervisionTestCases b/server/site_tests/cheets_GTS/control.GtsSupervisionTestCases
index ee2b8dc..f71479e 100644
--- a/server/site_tests/cheets_GTS/control.GtsSupervisionTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsSupervisionTestCases
@@ -28,6 +28,7 @@
         target_module='GtsSupervisionTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsSuspendAppsPermissionTestCases b/server/site_tests/cheets_GTS/control.GtsSuspendAppsPermissionTestCases
index 47d7b0e..c3419ca 100644
--- a/server/site_tests/cheets_GTS/control.GtsSuspendAppsPermissionTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsSuspendAppsPermissionTestCases
@@ -28,6 +28,7 @@
         target_module='GtsSuspendAppsPermissionTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsSuspendAppsTestCases b/server/site_tests/cheets_GTS/control.GtsSuspendAppsTestCases
index c549e64..39820d25 100644
--- a/server/site_tests/cheets_GTS/control.GtsSuspendAppsTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsSuspendAppsTestCases
@@ -28,6 +28,7 @@
         target_module='GtsSuspendAppsTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsTelecomManagerTests b/server/site_tests/cheets_GTS/control.GtsTelecomManagerTests
index 17ab395..58763db 100644
--- a/server/site_tests/cheets_GTS/control.GtsTelecomManagerTests
+++ b/server/site_tests/cheets_GTS/control.GtsTelecomManagerTests
@@ -28,6 +28,7 @@
         target_module='GtsTelecomManagerTests',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases b/server/site_tests/cheets_GTS/control.GtsTelephonyNumberVerificationHostCases
similarity index 63%
copy from server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases
copy to server/site_tests/cheets_GTS/control.GtsTelephonyNumberVerificationHostCases
index b9585f8..c6cf032 100644
--- a/server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsTelephonyNumberVerificationHostCases
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsGameDeviceHostTestCases'
+NAME = 'cheets_GTS.GtsTelephonyNumberVerificationHostCases'
 ATTRIBUTES = 'suite:gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsGameDeviceHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
+DOC = 'Run module GtsTelephonyNumberVerificationHostCases of the Android Google Test Suite (GTS) in the ARC++ container.'
 
 def run_TS(machine):
     host_list = [hosts.create_host(machine)]
@@ -21,13 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=2,
-        tag='GtsGameDeviceHostTestCases',
-        test_name='cheets_GTS.GtsGameDeviceHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsGameDeviceHostTestCases', '--ignore-business-logic-failure'],
+        tag='GtsTelephonyNumberVerificationHostCases',
+        test_name='cheets_GTS.GtsTelephonyNumberVerificationHostCases',
+        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsTelephonyNumberVerificationHostCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsGameDeviceHostTestCases',
+        target_module='GtsTelephonyNumberVerificationHostCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsTelephonyTestCases b/server/site_tests/cheets_GTS/control.GtsTelephonyTestCases
index 9e4ab84..47c5e27 100644
--- a/server/site_tests/cheets_GTS/control.GtsTelephonyTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsTelephonyTestCases
@@ -28,6 +28,7 @@
         target_module='GtsTelephonyTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsTestHarnessModeTestCases b/server/site_tests/cheets_GTS/control.GtsTestHarnessModeTestCases
index cc2ebc8..2f2c8eb 100644
--- a/server/site_tests/cheets_GTS/control.GtsTestHarnessModeTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsTestHarnessModeTestCases
@@ -28,6 +28,7 @@
         target_module='GtsTestHarnessModeTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsTetheringTestCases b/server/site_tests/cheets_GTS/control.GtsTetheringTestCases
index 42e4c6f..858a5ef 100644
--- a/server/site_tests/cheets_GTS/control.GtsTetheringTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsTetheringTestCases
@@ -28,6 +28,7 @@
         target_module='GtsTetheringTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsTvBugReportTestCases b/server/site_tests/cheets_GTS/control.GtsTvBugReportTestCases
index 3ab7d03..caa8c1f 100644
--- a/server/site_tests/cheets_GTS/control.GtsTvBugReportTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsTvBugReportTestCases
@@ -28,6 +28,7 @@
         target_module='GtsTvBugReportTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsTvHostTestCases b/server/site_tests/cheets_GTS/control.GtsTvHostTestCases
index cf8c0d7..dedf9f7 100644
--- a/server/site_tests/cheets_GTS/control.GtsTvHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsTvHostTestCases
@@ -28,6 +28,7 @@
         target_module='GtsTvHostTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsTvTestCases b/server/site_tests/cheets_GTS/control.GtsTvTestCases
index f202aba..17bfb48 100644
--- a/server/site_tests/cheets_GTS/control.GtsTvTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsTvTestCases
@@ -28,6 +28,7 @@
         target_module='GtsTvTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsUnofficialApisUsageTestCases b/server/site_tests/cheets_GTS/control.GtsUnofficialApisUsageTestCases
index 03b0421..4c30484 100644
--- a/server/site_tests/cheets_GTS/control.GtsUnofficialApisUsageTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsUnofficialApisUsageTestCases
@@ -28,6 +28,7 @@
         target_module='GtsUnofficialApisUsageTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsUsageStatsTestCases b/server/site_tests/cheets_GTS/control.GtsUsageStatsTestCases
index e42583d..cd95f0e 100644
--- a/server/site_tests/cheets_GTS/control.GtsUsageStatsTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsUsageStatsTestCases
@@ -28,6 +28,7 @@
         target_module='GtsUsageStatsTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases b/server/site_tests/cheets_GTS/control.GtsUserspaceRebootHostSideTestCases
similarity index 65%
copy from server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases
copy to server/site_tests/cheets_GTS/control.GtsUserspaceRebootHostSideTestCases
index b9585f8..c653bb2 100644
--- a/server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsUserspaceRebootHostSideTestCases
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsGameDeviceHostTestCases'
+NAME = 'cheets_GTS.GtsUserspaceRebootHostSideTestCases'
 ATTRIBUTES = 'suite:gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsGameDeviceHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
+DOC = 'Run module GtsUserspaceRebootHostSideTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
 
 def run_TS(machine):
     host_list = [hosts.create_host(machine)]
@@ -21,13 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=2,
-        tag='GtsGameDeviceHostTestCases',
-        test_name='cheets_GTS.GtsGameDeviceHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsGameDeviceHostTestCases', '--ignore-business-logic-failure'],
+        tag='GtsUserspaceRebootHostSideTestCases',
+        test_name='cheets_GTS.GtsUserspaceRebootHostSideTestCases',
+        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsUserspaceRebootHostSideTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsGameDeviceHostTestCases',
+        target_module='GtsUserspaceRebootHostSideTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsViewTestCases b/server/site_tests/cheets_GTS/control.GtsViewTestCases
index f707737..7d32d46 100644
--- a/server/site_tests/cheets_GTS/control.GtsViewTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsViewTestCases
@@ -28,6 +28,7 @@
         target_module='GtsViewTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases b/server/site_tests/cheets_GTS/control.GtsVndkDependencyTestCases
similarity index 71%
rename from server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases
rename to server/site_tests/cheets_GTS/control.GtsVndkDependencyTestCases
index b9585f8..b9080c5 100644
--- a/server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsVndkDependencyTestCases
@@ -5,14 +5,14 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_GTS.GtsGameDeviceHostTestCases'
+NAME = 'cheets_GTS.GtsVndkDependencyTestCases'
 ATTRIBUTES = 'suite:gts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 307200
-DOC = 'Run module GtsGameDeviceHostTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
+DOC = 'Run module GtsVndkDependencyTestCases of the Android Google Test Suite (GTS) in the ARC++ container.'
 
 def run_TS(machine):
     host_list = [hosts.create_host(machine)]
@@ -21,13 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=2,
-        tag='GtsGameDeviceHostTestCases',
-        test_name='cheets_GTS.GtsGameDeviceHostTestCases',
-        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsGameDeviceHostTestCases', '--ignore-business-logic-failure'],
+        tag='GtsVndkDependencyTestCases',
+        test_name='cheets_GTS.GtsVndkDependencyTestCases',
+        run_template=['run', 'commandAndExit', 'gts', '--module', 'GtsVndkDependencyTestCases', '--ignore-business-logic-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
-        target_module='GtsGameDeviceHostTestCases',
+        target_module='GtsVndkDependencyTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsWebViewHostTestCases b/server/site_tests/cheets_GTS/control.GtsWebViewHostTestCases
index eabccf4..6546112 100644
--- a/server/site_tests/cheets_GTS/control.GtsWebViewHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsWebViewHostTestCases
@@ -28,6 +28,7 @@
         target_module='GtsWebViewHostTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsWebViewTestCases b/server/site_tests/cheets_GTS/control.GtsWebViewTestCases
index c9ab11d..8582559 100644
--- a/server/site_tests/cheets_GTS/control.GtsWebViewTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsWebViewTestCases
@@ -28,6 +28,7 @@
         target_module='GtsWebViewTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsWellbeingHostTestCases b/server/site_tests/cheets_GTS/control.GtsWellbeingHostTestCases
index c02ec8c..9ae65dd 100644
--- a/server/site_tests/cheets_GTS/control.GtsWellbeingHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsWellbeingHostTestCases
@@ -28,6 +28,7 @@
         target_module='GtsWellbeingHostTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsWellbeingPermissionPolicyTestCases b/server/site_tests/cheets_GTS/control.GtsWellbeingPermissionPolicyTestCases
index 06287a0..3283fa1 100644
--- a/server/site_tests/cheets_GTS/control.GtsWellbeingPermissionPolicyTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsWellbeingPermissionPolicyTestCases
@@ -28,6 +28,7 @@
         target_module='GtsWellbeingPermissionPolicyTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsWellbeingTestCases b/server/site_tests/cheets_GTS/control.GtsWellbeingTestCases
index 32cecc9..0a35c4a 100644
--- a/server/site_tests/cheets_GTS/control.GtsWellbeingTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsWellbeingTestCases
@@ -28,6 +28,7 @@
         target_module='GtsWellbeingTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=720)
 
diff --git a/server/site_tests/cheets_GTS/control.GtsYouTubeTestCases b/server/site_tests/cheets_GTS/control.GtsYouTubeTestCases
index 0f38df3..35642fe 100644
--- a/server/site_tests/cheets_GTS/control.GtsYouTubeTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsYouTubeTestCases
@@ -29,6 +29,7 @@
         target_module='GtsYouTubeTestCases',
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=3600)
 
diff --git a/server/site_tests/cheets_GTS/control.tradefed-run-collect-tests-only b/server/site_tests/cheets_GTS/control.tradefed-run-collect-tests-only
index bed05b53..bf3fbf0 100644
--- a/server/site_tests/cheets_GTS/control.tradefed-run-collect-tests-only
+++ b/server/site_tests/cheets_GTS/control.tradefed-run-collect-tests-only
@@ -29,6 +29,7 @@
         target_module=None,
         target_plan=None,
         retry_manual_tests=True,
+        use_jdk9=True,
         warn_on_test_retry=False,
         timeout=1800)