diff --git a/server/site_tests/cheets_CTS_N/cheets_CTS_N.py b/server/site_tests/cheets_CTS_N/cheets_CTS_N.py
index 9cfc793..ab32b54 100644
--- a/server/site_tests/cheets_CTS_N/cheets_CTS_N.py
+++ b/server/site_tests/cheets_CTS_N/cheets_CTS_N.py
@@ -24,8 +24,8 @@
 # Public download locations for android cts bundles.
 _DL_CTS = 'https://dl.google.com/dl/android/cts/'
 _CTS_URI = {
-    'arm': _DL_CTS + 'android-cts-7.1_r12-linux_x86-arm.zip',
-    'x86': _DL_CTS + 'android-cts-7.1_r12-linux_x86-x86.zip',
+    'arm': _DL_CTS + 'android-cts-7.1_r13-linux_x86-arm.zip',
+    'x86': _DL_CTS + 'android-cts-7.1_r13-linux_x86-x86.zip',
     'media': _DL_CTS + 'android-cts-media-1.4.zip',
 }
 
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAadbHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAadbHostTestCases
index 234ecd1..fba14ef 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsAadbHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsAadbHostTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsAadbHostTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAbiOverrideHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAbiOverrideHostTestCases
index 9e8aaff..5a20749 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsAbiOverrideHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsAbiOverrideHostTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsAbiOverrideHostTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAccelerationTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAccelerationTestCases
index 1b3c91f..93be56e 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsAccelerationTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsAccelerationTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsAccelerationTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAccessibilityServiceTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAccessibilityServiceTestCases
index 6b06258..40a490f 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsAccessibilityServiceTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsAccessibilityServiceTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsAccessibilityServiceTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAccessibilityTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAccessibilityTestCases
index 3cbb866..2cc3560 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsAccessibilityTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsAccessibilityTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsAccessibilityTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAccountManagerTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAccountManagerTestCases
index b0d12fc..57ae8ab 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsAccountManagerTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsAccountManagerTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsAccountManagerTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAdminTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAdminTestCases
index 4b5ca2c..d5c57d2 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsAdminTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsAdminTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsAdminTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAlarmClockTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAlarmClockTestCases
index cd04d6d..9f5ad80 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsAlarmClockTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsAlarmClockTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsAlarmClockTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAndroidAppTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAndroidAppTestCases
index b052ef4..ce6d6c0 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsAndroidAppTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsAndroidAppTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsAndroidAppTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAnimationTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAnimationTestCases
index 76e3176..61476fa 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsAnimationTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsAnimationTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsAnimationTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAppSecurityHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAppSecurityHostTestCases
index 5b4eb3b..27c7d6e 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsAppSecurityHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsAppSecurityHostTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsAppSecurityHostTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAppTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAppTestCases
index ea71192..f2c7893 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsAppTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsAppTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsAppTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAppUsageHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAppUsageHostTestCases
index cf3afca..a81c9e7 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsAppUsageHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsAppUsageHostTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsAppUsageHostTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAppWidgetTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAppWidgetTestCases
index 0a30f4b..5a4c526 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsAppWidgetTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsAppWidgetTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsAppWidgetTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAslrMallocTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAslrMallocTestCases
index 4c45bdf..b95bf63 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsAslrMallocTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsAslrMallocTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsAslrMallocTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAssistTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAssistTestCases
index d8f9b40..a16e17f 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsAssistTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsAssistTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsAssistTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAtraceHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAtraceHostTestCases
index 6ab4d27..93378af 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsAtraceHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsAtraceHostTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsAtraceHostTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsBackupHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsBackupHostTestCases
index 918e7b2..5b72813 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsBackupHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsBackupHostTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsBackupHostTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsBackupTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsBackupTestCases
index 4ecf99e..7a24857 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsBackupTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsBackupTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsBackupTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsBionicTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsBionicTestCases
index acfc067..9788a3b 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsBionicTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsBionicTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsBionicTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsBluetoothTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsBluetoothTestCases
index 884ad9b..55ec46e 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsBluetoothTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsBluetoothTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsBluetoothTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsCalendarcommon2TestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsCalendarcommon2TestCases
index 9bb812c..9dcf2a7 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsCalendarcommon2TestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsCalendarcommon2TestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsCalendarcommon2TestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsCameraTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsCameraTestCases
index d2b5b16..893ef43 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsCameraTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsCameraTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, lighting'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsCameraTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsCarTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsCarTestCases
index e1ecd3e..4bff494 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsCarTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsCarTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsCarTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsCarrierApiTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsCarrierApiTestCases
index a7ebf36..11df692 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsCarrierApiTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsCarrierApiTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsCarrierApiTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsCompilationTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsCompilationTestCases
index 438813a..444486d 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsCompilationTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsCompilationTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsCompilationTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsContentTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsContentTestCases
index 5410af5..8cc01f3 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsContentTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsContentTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsContentTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsCppToolsTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsCppToolsTestCases
index 385e1de..d55e355 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsCppToolsTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsCppToolsTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsCppToolsTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsDatabaseTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsDatabaseTestCases
index 14683a8..da9999f 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsDatabaseTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsDatabaseTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsDatabaseTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsDeqpTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsDeqpTestCases
index 31948a6..770f3df 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsDeqpTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsDeqpTestCases
@@ -10,13 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
-PRIORITY = 50
 
 DOC = ('Run module CtsDeqpTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsDeviceAdminUninstallerTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsDeviceAdminUninstallerTestCases
index 36cc404..81effd5 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsDeviceAdminUninstallerTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsDeviceAdminUninstallerTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsDeviceAdminUninstallerTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsDevicePolicyManagerTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsDevicePolicyManagerTestCases
index 8e0e8dc..efcc57a 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsDevicePolicyManagerTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsDevicePolicyManagerTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsDevicePolicyManagerTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsDisplayTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsDisplayTestCases
index dd3a71e..df38cb4 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsDisplayTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsDisplayTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsDisplayTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsDpiTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsDpiTestCases
index 9751c73..99cb9cd 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsDpiTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsDpiTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsDpiTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsDpiTestCases2 b/server/site_tests/cheets_CTS_N/control.arm.CtsDpiTestCases2
index 42982aa..e8e4a7b 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsDpiTestCases2
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsDpiTestCases2
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsDpiTestCases2 of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsDragAndDropHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsDragAndDropHostTestCases
index 82ad77d..50747b5 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsDragAndDropHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsDragAndDropHostTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsDragAndDropHostTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsDramTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsDramTestCases
index 86d7459..04f5f96 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsDramTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsDramTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsDramTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsDreamsTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsDreamsTestCases
index 5f33fab..006ad9e 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsDreamsTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsDreamsTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsDreamsTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsDrmTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsDrmTestCases
index 66979ac..bf5d4fd 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsDrmTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsDrmTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsDrmTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsDumpsysHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsDumpsysHostTestCases
index 118fbd5..bf5fff9 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsDumpsysHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsDumpsysHostTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsDumpsysHostTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsEffectTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsEffectTestCases
index ebf98d1..a3ab128 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsEffectTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsEffectTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsEffectTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsExternalServiceTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsExternalServiceTestCases
index db2e85c..bb2b1f5 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsExternalServiceTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsExternalServiceTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsExternalServiceTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsFileSystemTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsFileSystemTestCases
index e4d78bf..89fb4b4 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsFileSystemTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsFileSystemTestCases
@@ -10,13 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
-PRIORITY = 50
 
 DOC = ('Run module CtsFileSystemTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsFragmentTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsFragmentTestCases
index 5c359ae..88d28c5 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsFragmentTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsFragmentTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsFragmentTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsGestureTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsGestureTestCases
index 6fb492a..9dc45d6 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsGestureTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsGestureTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsGestureTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsGraphics2TestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsGraphics2TestCases
index 396dc37..dba0981 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsGraphics2TestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsGraphics2TestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsGraphics2TestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsGraphicsTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsGraphicsTestCases
index d94122f..84e4298 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsGraphicsTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsGraphicsTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsGraphicsTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsHardwareTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsHardwareTestCases
index 7b21293..187fdbb 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsHardwareTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsHardwareTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsHardwareTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsHostsideNetworkTests b/server/site_tests/cheets_CTS_N/control.arm.CtsHostsideNetworkTests
index 4cb3cb8..e86dae2 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsHostsideNetworkTests
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsHostsideNetworkTests
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsHostsideNetworkTests of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsHostsideNumberBlockingTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsHostsideNumberBlockingTestCases
index c550746..2bf7c4d 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsHostsideNumberBlockingTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsHostsideNumberBlockingTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsHostsideNumberBlockingTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsHostsideTvTests b/server/site_tests/cheets_CTS_N/control.arm.CtsHostsideTvTests
index 74061e3..c2d09c3 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsHostsideTvTests
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsHostsideTvTests
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsHostsideTvTests of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsIcuTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsIcuTestCases
index 9d147b2..30157fd 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsIcuTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsIcuTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsIcuTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsJankDeviceTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsJankDeviceTestCases
index 7d832ef..0e8d5a9 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsJankDeviceTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsJankDeviceTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsJankDeviceTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsJdwpSecurityHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsJdwpSecurityHostTestCases
index a7b2255..c7e0a04 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsJdwpSecurityHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsJdwpSecurityHostTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsJdwpSecurityHostTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsJdwpTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsJdwpTestCases
index c64b73e..daefeca 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsJdwpTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsJdwpTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsJdwpTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsJniTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsJniTestCases
index 68adb8a..38a6281 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsJniTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsJniTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsJniTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsJobSchedulerTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsJobSchedulerTestCases
index 0a9e573..7aa11e9 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsJobSchedulerTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsJobSchedulerTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsJobSchedulerTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsKeystoreTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsKeystoreTestCases
index b2175a3..2ddb68b 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsKeystoreTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsKeystoreTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsKeystoreTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsLeanbackJankTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsLeanbackJankTestCases
index 482accf..f855e7e 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsLeanbackJankTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsLeanbackJankTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsLeanbackJankTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreLegacy22TestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreLegacy22TestCases
index e8fc000..a88ff8c 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreLegacy22TestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreLegacy22TestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsLibcoreLegacy22TestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreOjTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreOjTestCases
index bbda08e..0409650 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreOjTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreOjTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsLibcoreOjTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreOkHttpTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreOkHttpTestCases
index 71bdf46..1e07284 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreOkHttpTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreOkHttpTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsLibcoreOkHttpTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreTestCases
index 0b6fc48..4a65c40 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsLibcoreTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsLocation2TestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsLocation2TestCases
index 256d9ea..0499ce8 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsLocation2TestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsLocation2TestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsLocation2TestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsLocationTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsLocationTestCases
index 498dddc..e7fff46 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsLocationTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsLocationTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsLocationTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsMediaStressTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsMediaStressTestCases
index b68699e..213e3f5 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsMediaStressTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsMediaStressTestCases
@@ -10,13 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
-PRIORITY = 50
 
 DOC = ('Run module CtsMediaStressTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsMediaTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsMediaTestCases
index 4f49487..f854653 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsMediaTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsMediaTestCases
@@ -10,13 +10,11 @@
 DEPENDENCIES = 'arc, noloopback'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
-PRIORITY = 50
 
 DOC = ('Run module CtsMediaTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsMidiTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsMidiTestCases
index 3404fcb..2477a38 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsMidiTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsMidiTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsMidiTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsMonkeyTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsMonkeyTestCases
index e3ec38e..cf4111b 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsMonkeyTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsMonkeyTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsMonkeyTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsMultiUserHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsMultiUserHostTestCases
index 40b6da5..e02b8c0 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsMultiUserHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsMultiUserHostTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsMultiUserHostTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsMultiUserTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsMultiUserTestCases
index 92ea7bd..aee7768 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsMultiUserTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsMultiUserTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsMultiUserTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNativeMediaSlTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsNativeMediaSlTestCases
index bbf604c..3b56153 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNativeMediaSlTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNativeMediaSlTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsNativeMediaSlTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNativeMediaXaTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsNativeMediaXaTestCases
index a3dbfba..c5a5575 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNativeMediaXaTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNativeMediaXaTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsNativeMediaXaTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNativeNetTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsNativeNetTestCases
index 28431f8..22e4c30 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNativeNetTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNativeNetTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsNativeNetTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNdefTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsNdefTestCases
index ace4f9d..9e0f3b4 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNdefTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNdefTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsNdefTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigAttributeTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigAttributeTestCases
index da2e709..011bd9e 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigAttributeTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigAttributeTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsNetSecConfigAttributeTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigBasicDebugDisabledTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigBasicDebugDisabledTestCases
index 6c5a700..d0e3c24 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigBasicDebugDisabledTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigBasicDebugDisabledTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsNetSecConfigBasicDebugDisabledTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigBasicDebugEnabledTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigBasicDebugEnabledTestCases
index e912b9d..dbe15de 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigBasicDebugEnabledTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigBasicDebugEnabledTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsNetSecConfigBasicDebugEnabledTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigBasicDomainConfigTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigBasicDomainConfigTestCases
index 0126458..5f60bca 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigBasicDomainConfigTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigBasicDomainConfigTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsNetSecConfigBasicDomainConfigTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigCleartextTrafficTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigCleartextTrafficTestCases
index 4938823..6652b1a 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigCleartextTrafficTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigCleartextTrafficTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsNetSecConfigCleartextTrafficTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigDownloadManagerTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigDownloadManagerTestCases
index 9c6b394..6ba3a6f 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigDownloadManagerTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigDownloadManagerTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsNetSecConfigDownloadManagerTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigInvalidPinTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigInvalidPinTestCases
index 175db27..4f001d6 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigInvalidPinTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigInvalidPinTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsNetSecConfigInvalidPinTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigNestedDomainConfigTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigNestedDomainConfigTestCases
index 0cf2427..334322d 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigNestedDomainConfigTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigNestedDomainConfigTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsNetSecConfigNestedDomainConfigTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigResourcesSrcTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigResourcesSrcTestCases
index 6b7e50e..b3e79ff 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigResourcesSrcTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigResourcesSrcTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsNetSecConfigResourcesSrcTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecPolicyUsesCleartextTrafficFalseTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecPolicyUsesCleartextTrafficFalseTestCases
index 7819965..9b4f915 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecPolicyUsesCleartextTrafficFalseTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecPolicyUsesCleartextTrafficFalseTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsNetSecPolicyUsesCleartextTrafficFalseTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecPolicyUsesCleartextTrafficTrueTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecPolicyUsesCleartextTrafficTrueTestCases
index 492eb0d..0c792bb 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecPolicyUsesCleartextTrafficTrueTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecPolicyUsesCleartextTrafficTrueTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsNetSecPolicyUsesCleartextTrafficTrueTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases
index 40a7bf1..0ea6d3b 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNetTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsNetTestCases
index b52bf64..6ccf22b 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNetTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNetTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsNetTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
@@ -36,4 +35,4 @@
 ],
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNetTestCasesLegacyApi22 b/server/site_tests/cheets_CTS_N/control.arm.CtsNetTestCasesLegacyApi22
index ca3a56a..4e56014 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNetTestCasesLegacyApi22
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNetTestCasesLegacyApi22
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsNetTestCasesLegacyApi22 of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNetTestCasesLegacyPermission22 b/server/site_tests/cheets_CTS_N/control.arm.CtsNetTestCasesLegacyPermission22
index edae148..1434bee 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNetTestCasesLegacyPermission22
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNetTestCasesLegacyPermission22
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsNetTestCasesLegacyPermission22 of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsOpenGLTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsOpenGLTestCases
index e713446..94dd965 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsOpenGLTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsOpenGLTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsOpenGLTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsOpenGlPerf2TestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsOpenGlPerf2TestCases
index 055e30d..472d5fa 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsOpenGlPerf2TestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsOpenGlPerf2TestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsOpenGlPerf2TestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsOpenGlPerfTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsOpenGlPerfTestCases
index ab6795b..5764e0c 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsOpenGlPerfTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsOpenGlPerfTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsOpenGlPerfTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsOsHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsOsHostTestCases
index 2b25e77..e2a360a 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsOsHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsOsHostTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsOsHostTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsOsTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsOsTestCases
index c67cbf8..5cc74f5 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsOsTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsOsTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsOsTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsPermission2TestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsPermission2TestCases
index ccd335a..2b78fed 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsPermission2TestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsPermission2TestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsPermission2TestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsPermissionTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsPermissionTestCases
index 00fd4fa..015e11a 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsPermissionTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsPermissionTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsPermissionTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsPreference2TestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsPreference2TestCases
index 9916ff3..b297c5e 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsPreference2TestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsPreference2TestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsPreference2TestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsPreferenceTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsPreferenceTestCases
index 85f72a9..43c0a20 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsPreferenceTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsPreferenceTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsPreferenceTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsPrintTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsPrintTestCases
index 6ea0da7..1a11044 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsPrintTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsPrintTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsPrintTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsProviderTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsProviderTestCases
index 590265a..e9f9e6a 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsProviderTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsProviderTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsProviderTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsRenderscriptLegacyTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsRenderscriptLegacyTestCases
index a54cb45..b2d6d88 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsRenderscriptLegacyTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsRenderscriptLegacyTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsRenderscriptLegacyTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsRenderscriptTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsRenderscriptTestCases
index 219e234..4ae1862 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsRenderscriptTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsRenderscriptTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsRenderscriptTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsRetailDemoHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsRetailDemoHostTestCases
index d06bde5..fe5d027 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsRetailDemoHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsRetailDemoHostTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsRetailDemoHostTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsRsBlasTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsRsBlasTestCases
index 33fc5c5..0c3d1e0 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsRsBlasTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsRsBlasTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsRsBlasTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsRsCppTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsRsCppTestCases
index db63048..a121b07 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsRsCppTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsRsCppTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsRsCppTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsSampleDeviceTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsSampleDeviceTestCases
index c69f177..dbf909a 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsSampleDeviceTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsSampleDeviceTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsSampleDeviceTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsSampleHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsSampleHostTestCases
index e420dd0..c249601 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsSampleHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsSampleHostTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsSampleHostTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsSaxTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsSaxTestCases
index a1c077c..3982317 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsSaxTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsSaxTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsSaxTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsSecurityHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsSecurityHostTestCases
index b392744..5fd8585 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsSecurityHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsSecurityHostTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsSecurityHostTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
@@ -33,4 +32,4 @@
         precondition_commands=['echo 3 > /proc/sys/kernel/perf_event_paranoid'],
         timeout=5400)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsSecurityTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsSecurityTestCases
index 3081f4f..f30930c 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsSecurityTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsSecurityTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsSecurityTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsServicesHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsServicesHostTestCases
index e963d96..472f7b2 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsServicesHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsServicesHostTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsServicesHostTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsShortcutHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsShortcutHostTestCases
index daa5f2f..e6e4bc5 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsShortcutHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsShortcutHostTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsShortcutHostTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsShortcutManagerTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsShortcutManagerTestCases
index 911c828..26c699d 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsShortcutManagerTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsShortcutManagerTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsShortcutManagerTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsSignatureTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsSignatureTestCases
index 8a3e047..adfb558 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsSignatureTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsSignatureTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsSignatureTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsSimpleCpuTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsSimpleCpuTestCases
index e47a689..8d0a126 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsSimpleCpuTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsSimpleCpuTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsSimpleCpuTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsSimpleperfTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsSimpleperfTestCases
index 6022ff5..e815df8 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsSimpleperfTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsSimpleperfTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsSimpleperfTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsSpeechTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsSpeechTestCases
index 7e13df4..3dcd7d0 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsSpeechTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsSpeechTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsSpeechTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsSustainedPerformanceHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsSustainedPerformanceHostTestCases
index 4701823..42f258c 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsSustainedPerformanceHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsSustainedPerformanceHostTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsSustainedPerformanceHostTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsSystemIntentTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsSystemIntentTestCases
index 4de45e1..f76ab87 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsSystemIntentTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsSystemIntentTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsSystemIntentTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsSystemUiHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsSystemUiHostTestCases
index 0a6359a..5810e86 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsSystemUiHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsSystemUiHostTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsSystemUiHostTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsSystemUiTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsSystemUiTestCases
index 4be1fc1..57332d2 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsSystemUiTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsSystemUiTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsSystemUiTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsTelecomTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsTelecomTestCases
index 0d14490..0bf1a09 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsTelecomTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsTelecomTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsTelecomTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsTelecomTestCases2 b/server/site_tests/cheets_CTS_N/control.arm.CtsTelecomTestCases2
index c4b3611..7786ac5 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsTelecomTestCases2
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsTelecomTestCases2
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsTelecomTestCases2 of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsTelephony2TestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsTelephony2TestCases
index 5c12022..a98c497 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsTelephony2TestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsTelephony2TestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsTelephony2TestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsTelephonyTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsTelephonyTestCases
index 4eb437e..b834559 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsTelephonyTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsTelephonyTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsTelephonyTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsTextTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsTextTestCases
index c97cdeb..f29cf54 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsTextTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsTextTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsTextTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsTextureViewTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsTextureViewTestCases
index 5890a56..a040591 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsTextureViewTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsTextureViewTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsTextureViewTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsThemeDeviceTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsThemeDeviceTestCases
index 730a662..ed9c293 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsThemeDeviceTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsThemeDeviceTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsThemeDeviceTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsThemeHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsThemeHostTestCases
index 16aa067..0bd4a44 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsThemeHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsThemeHostTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsThemeHostTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsToastLegacyTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsToastLegacyTestCases
index 2652f45..4346bf8 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsToastLegacyTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsToastLegacyTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsToastLegacyTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsToastTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsToastTestCases
index dc470ec..b7a07d7 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsToastTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsToastTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsToastTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsTransitionTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsTransitionTestCases
index 9bfaabc..24a8fc1 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsTransitionTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsTransitionTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsTransitionTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsTrustedVoiceHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsTrustedVoiceHostTestCases
index 568ba88..fd18b5f 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsTrustedVoiceHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsTrustedVoiceHostTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsTrustedVoiceHostTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsTvProviderTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsTvProviderTestCases
index f4c8b2a..49eee7b 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsTvProviderTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsTvProviderTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsTvProviderTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsTvTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsTvTestCases
index d6e48ac..5a8f8ac 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsTvTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsTvTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsTvTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsUiAutomationTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsUiAutomationTestCases
index 53c4bcc..c661153 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsUiAutomationTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsUiAutomationTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsUiAutomationTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsUiDeviceTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsUiDeviceTestCases
index e555a36..5546325 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsUiDeviceTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsUiDeviceTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsUiDeviceTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsUiHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsUiHostTestCases
index 2977f97..badd1b1 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsUiHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsUiHostTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsUiHostTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsUiRenderingTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsUiRenderingTestCases
index a4436f2..2b26033 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsUiRenderingTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsUiRenderingTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsUiRenderingTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsUidIsolationTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsUidIsolationTestCases
index 43d097d..0f44bca 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsUidIsolationTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsUidIsolationTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsUidIsolationTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsUsageStatsTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsUsageStatsTestCases
index f2656c7..28cb734 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsUsageStatsTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsUsageStatsTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsUsageStatsTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
@@ -36,4 +35,4 @@
 ],
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsUsbTests b/server/site_tests/cheets_CTS_N/control.arm.CtsUsbTests
index ef34de8..1ec914a 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsUsbTests
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsUsbTests
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsUsbTests of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsUtilTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsUtilTestCases
index dbb3702..470b9e9 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsUtilTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsUtilTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsUtilTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsVideoTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsVideoTestCases
index 56859db..fceb53b 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsVideoTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsVideoTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsVideoTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsViewTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsViewTestCases
index 14c9556..a026b7d 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsViewTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsViewTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsViewTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsVmTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsVmTestCases
index 4323f8d..403dd7a 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsVmTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsVmTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsVmTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsVoiceInteractionTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsVoiceInteractionTestCases
index 54b8d5c..62ba94d 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsVoiceInteractionTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsVoiceInteractionTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsVoiceInteractionTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsVoiceSettingsTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsVoiceSettingsTestCases
index f5f9083..3608968 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsVoiceSettingsTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsVoiceSettingsTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsVoiceSettingsTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsVrTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsVrTestCases
index 4d2848c..7a4b9d0 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsVrTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsVrTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsVrTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsWebkitTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsWebkitTestCases
index b386868..6ea5534 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsWebkitTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsWebkitTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsWebkitTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsWidgetTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsWidgetTestCases
index fc8ff30..afe630c 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsWidgetTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsWidgetTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsWidgetTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.arm.vm-tests-tf b/server/site_tests/cheets_CTS_N/control.arm.vm-tests-tf
index 4438e94..8ba5f6f 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.vm-tests-tf
+++ b/server/site_tests/cheets_CTS_N/control.arm.vm-tests-tf
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module vm-tests-tf of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using arm ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAadbHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAadbHostTestCases
index e60a8ad..e3b57c2 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsAadbHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsAadbHostTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsAadbHostTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAbiOverrideHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAbiOverrideHostTestCases
index f1ed5c2..456e38d 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsAbiOverrideHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsAbiOverrideHostTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsAbiOverrideHostTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAccelerationTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAccelerationTestCases
index 176e74f..999e3d1 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsAccelerationTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsAccelerationTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsAccelerationTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAccessibilityServiceTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAccessibilityServiceTestCases
index 33dfd66..bc38fdd 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsAccessibilityServiceTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsAccessibilityServiceTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsAccessibilityServiceTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAccessibilityTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAccessibilityTestCases
index 962a43f..76411c7 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsAccessibilityTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsAccessibilityTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsAccessibilityTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAccountManagerTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAccountManagerTestCases
index bd98cda..2b00ccb 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsAccountManagerTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsAccountManagerTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsAccountManagerTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAdminTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAdminTestCases
index 82af5c8..a71758f 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsAdminTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsAdminTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsAdminTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAlarmClockTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAlarmClockTestCases
index 9e39725..3a1c699 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsAlarmClockTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsAlarmClockTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsAlarmClockTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAndroidAppTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAndroidAppTestCases
index aafb223..6672eb3 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsAndroidAppTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsAndroidAppTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsAndroidAppTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAnimationTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAnimationTestCases
index 85780f5..692e70a 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsAnimationTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsAnimationTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsAnimationTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAppSecurityHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAppSecurityHostTestCases
index cd60c5e..799b6fc 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsAppSecurityHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsAppSecurityHostTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsAppSecurityHostTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAppTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAppTestCases
index 3c0308b..aa23a20 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsAppTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsAppTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsAppTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAppUsageHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAppUsageHostTestCases
index ca7d93d..390db1d 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsAppUsageHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsAppUsageHostTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsAppUsageHostTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAppWidgetTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAppWidgetTestCases
index dc5de60..3d963e6 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsAppWidgetTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsAppWidgetTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsAppWidgetTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAslrMallocTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAslrMallocTestCases
index 104213d..a8ca312 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsAslrMallocTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsAslrMallocTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsAslrMallocTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAssistTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAssistTestCases
index 1a639ee..0503066 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsAssistTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsAssistTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsAssistTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAtraceHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAtraceHostTestCases
index 3ff9c23..0bc6b79 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsAtraceHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsAtraceHostTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsAtraceHostTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsBackupHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsBackupHostTestCases
index ecde80b..9c9a65a 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsBackupHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsBackupHostTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsBackupHostTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsBackupTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsBackupTestCases
index 471d7b3..6828cce 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsBackupTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsBackupTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsBackupTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsBionicTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsBionicTestCases
index 5025cc1..67b8fef 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsBionicTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsBionicTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsBionicTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsBluetoothTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsBluetoothTestCases
index 8a895ec..7515d8e 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsBluetoothTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsBluetoothTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsBluetoothTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsCalendarcommon2TestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsCalendarcommon2TestCases
index f604561..5c72a88 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsCalendarcommon2TestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsCalendarcommon2TestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsCalendarcommon2TestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsCameraTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsCameraTestCases
index bec9068..fa4029e 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsCameraTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsCameraTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86, lighting'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsCameraTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsCarTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsCarTestCases
index d233f5c..11c8d8b 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsCarTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsCarTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsCarTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsCarrierApiTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsCarrierApiTestCases
index a0f1506..6e4a0aa 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsCarrierApiTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsCarrierApiTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsCarrierApiTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsCompilationTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsCompilationTestCases
index c11d379..9613c08 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsCompilationTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsCompilationTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsCompilationTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsContentTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsContentTestCases
index 6778b21..fb19ac7 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsContentTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsContentTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsContentTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsCppToolsTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsCppToolsTestCases
index edc8328..fcd0633 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsCppToolsTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsCppToolsTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsCppToolsTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsDatabaseTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsDatabaseTestCases
index 19a1b1b..d9ae177 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsDatabaseTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsDatabaseTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsDatabaseTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsDeqpTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsDeqpTestCases
index 1e0ff20..2350aab 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsDeqpTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsDeqpTestCases
@@ -10,13 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
-PRIORITY = 50
 
 DOC = ('Run module CtsDeqpTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsDeviceAdminUninstallerTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsDeviceAdminUninstallerTestCases
index d34d77f..f30d6f2 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsDeviceAdminUninstallerTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsDeviceAdminUninstallerTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsDeviceAdminUninstallerTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsDevicePolicyManagerTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsDevicePolicyManagerTestCases
index 2b3e886..2f2eb8c 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsDevicePolicyManagerTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsDevicePolicyManagerTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsDevicePolicyManagerTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsDisplayTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsDisplayTestCases
index 98f2299..a3dac38 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsDisplayTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsDisplayTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsDisplayTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsDpiTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsDpiTestCases
index 655c68b..0d06b24 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsDpiTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsDpiTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsDpiTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsDpiTestCases2 b/server/site_tests/cheets_CTS_N/control.x86.CtsDpiTestCases2
index 05a2a67..b4903c2 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsDpiTestCases2
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsDpiTestCases2
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsDpiTestCases2 of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsDragAndDropHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsDragAndDropHostTestCases
index 83868cc..3c64da8 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsDragAndDropHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsDragAndDropHostTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsDragAndDropHostTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsDramTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsDramTestCases
index 6da778f..4d1610e 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsDramTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsDramTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsDramTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsDreamsTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsDreamsTestCases
index 403bd1d..6c2672e 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsDreamsTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsDreamsTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsDreamsTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsDrmTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsDrmTestCases
index 224efd7..357fdc2 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsDrmTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsDrmTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsDrmTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsDumpsysHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsDumpsysHostTestCases
index 2238452..3d76495 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsDumpsysHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsDumpsysHostTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsDumpsysHostTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsEffectTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsEffectTestCases
index 6c706e1..0722e35 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsEffectTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsEffectTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsEffectTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsExternalServiceTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsExternalServiceTestCases
index c68c8d1..1462048 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsExternalServiceTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsExternalServiceTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsExternalServiceTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsFileSystemTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsFileSystemTestCases
index e2e7478..33f0cf9 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsFileSystemTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsFileSystemTestCases
@@ -10,13 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
-PRIORITY = 50
 
 DOC = ('Run module CtsFileSystemTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsFragmentTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsFragmentTestCases
index f606b83..a0a0b29 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsFragmentTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsFragmentTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsFragmentTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsGestureTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsGestureTestCases
index a425caa..a78988e 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsGestureTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsGestureTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsGestureTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsGraphics2TestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsGraphics2TestCases
index 80e6374..d8a12ba 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsGraphics2TestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsGraphics2TestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsGraphics2TestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsGraphicsTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsGraphicsTestCases
index a8e557a..eb774f2 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsGraphicsTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsGraphicsTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsGraphicsTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsHardwareTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsHardwareTestCases
index f6abca4..d24f9fc 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsHardwareTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsHardwareTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsHardwareTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsHostsideNetworkTests b/server/site_tests/cheets_CTS_N/control.x86.CtsHostsideNetworkTests
index 03229d5..ebb4923 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsHostsideNetworkTests
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsHostsideNetworkTests
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsHostsideNetworkTests of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsHostsideNumberBlockingTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsHostsideNumberBlockingTestCases
index 9286e2f..45ce62a 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsHostsideNumberBlockingTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsHostsideNumberBlockingTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsHostsideNumberBlockingTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsHostsideTvTests b/server/site_tests/cheets_CTS_N/control.x86.CtsHostsideTvTests
index d7e8008..5b873e9 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsHostsideTvTests
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsHostsideTvTests
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsHostsideTvTests of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsIcuTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsIcuTestCases
index 0ea0071..5738363 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsIcuTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsIcuTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsIcuTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsJankDeviceTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsJankDeviceTestCases
index 9d3707d..34c9a20 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsJankDeviceTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsJankDeviceTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsJankDeviceTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsJdwpSecurityHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsJdwpSecurityHostTestCases
index 7e81ae2..9bb6697 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsJdwpSecurityHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsJdwpSecurityHostTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsJdwpSecurityHostTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsJdwpTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsJdwpTestCases
index a9d2e40..3198a3b 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsJdwpTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsJdwpTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsJdwpTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsJniTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsJniTestCases
index afceb26..a4398fe 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsJniTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsJniTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsJniTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsJobSchedulerTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsJobSchedulerTestCases
index b2716fe..7b4306f 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsJobSchedulerTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsJobSchedulerTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsJobSchedulerTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsKeystoreTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsKeystoreTestCases
index e3a1350..ad3bc08 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsKeystoreTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsKeystoreTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsKeystoreTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsLeanbackJankTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsLeanbackJankTestCases
index 05e76e8..1bbb1d4 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsLeanbackJankTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsLeanbackJankTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsLeanbackJankTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreLegacy22TestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreLegacy22TestCases
index d426294..3980c9a 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreLegacy22TestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreLegacy22TestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsLibcoreLegacy22TestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreOjTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreOjTestCases
index 290fa01..d4eda06 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreOjTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreOjTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsLibcoreOjTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreOkHttpTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreOkHttpTestCases
index 2df9ced..4d9b43c 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreOkHttpTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreOkHttpTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsLibcoreOkHttpTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreTestCases
index b15f7dd..b4aaf0b 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsLibcoreTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsLocation2TestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsLocation2TestCases
index 88b65c0..a840901 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsLocation2TestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsLocation2TestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsLocation2TestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsLocationTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsLocationTestCases
index 863ac08..179609f 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsLocationTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsLocationTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsLocationTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsMediaStressTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsMediaStressTestCases
index 65569bb..6d0425d 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsMediaStressTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsMediaStressTestCases
@@ -10,13 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
-PRIORITY = 50
 
 DOC = ('Run module CtsMediaStressTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsMediaTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsMediaTestCases
index 06469f7..6cfa8ee 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsMediaTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsMediaTestCases
@@ -10,13 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86, noloopback'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
-PRIORITY = 50
 
 DOC = ('Run module CtsMediaTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsMidiTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsMidiTestCases
index 46e7972..763d21d 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsMidiTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsMidiTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsMidiTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsMonkeyTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsMonkeyTestCases
index 695ac5f..6909939 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsMonkeyTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsMonkeyTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsMonkeyTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsMultiUserHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsMultiUserHostTestCases
index bfdfe8f..e1caf17 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsMultiUserHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsMultiUserHostTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsMultiUserHostTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsMultiUserTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsMultiUserTestCases
index 158c309..803bedc 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsMultiUserTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsMultiUserTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsMultiUserTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNativeMediaSlTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsNativeMediaSlTestCases
index 2b42956..5a86242 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNativeMediaSlTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNativeMediaSlTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsNativeMediaSlTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNativeMediaXaTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsNativeMediaXaTestCases
index b2ad99e..1e747a1 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNativeMediaXaTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNativeMediaXaTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsNativeMediaXaTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNativeNetTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsNativeNetTestCases
index dfcd200..dd97f96 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNativeNetTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNativeNetTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsNativeNetTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNdefTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsNdefTestCases
index d026eed..3964625 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNdefTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNdefTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsNdefTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigAttributeTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigAttributeTestCases
index 98a271d..e651d8a 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigAttributeTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigAttributeTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsNetSecConfigAttributeTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigBasicDebugDisabledTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigBasicDebugDisabledTestCases
index fad7996..5548a47 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigBasicDebugDisabledTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigBasicDebugDisabledTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsNetSecConfigBasicDebugDisabledTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigBasicDebugEnabledTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigBasicDebugEnabledTestCases
index 6d919df..188d7c1 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigBasicDebugEnabledTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigBasicDebugEnabledTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsNetSecConfigBasicDebugEnabledTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigBasicDomainConfigTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigBasicDomainConfigTestCases
index 23ffe6f..43ba7cb 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigBasicDomainConfigTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigBasicDomainConfigTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsNetSecConfigBasicDomainConfigTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigCleartextTrafficTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigCleartextTrafficTestCases
index 84b7b7d..3bb661a 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigCleartextTrafficTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigCleartextTrafficTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsNetSecConfigCleartextTrafficTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigDownloadManagerTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigDownloadManagerTestCases
index 2de20c3..b30e48c 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigDownloadManagerTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigDownloadManagerTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsNetSecConfigDownloadManagerTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigInvalidPinTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigInvalidPinTestCases
index 0af159f..95dabb3 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigInvalidPinTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigInvalidPinTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsNetSecConfigInvalidPinTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigNestedDomainConfigTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigNestedDomainConfigTestCases
index 200cbab..3993f0f 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigNestedDomainConfigTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigNestedDomainConfigTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsNetSecConfigNestedDomainConfigTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigResourcesSrcTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigResourcesSrcTestCases
index 399b47a..844e437 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigResourcesSrcTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigResourcesSrcTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsNetSecConfigResourcesSrcTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecPolicyUsesCleartextTrafficFalseTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecPolicyUsesCleartextTrafficFalseTestCases
index cb660ac..c2fa907 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecPolicyUsesCleartextTrafficFalseTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecPolicyUsesCleartextTrafficFalseTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsNetSecPolicyUsesCleartextTrafficFalseTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecPolicyUsesCleartextTrafficTrueTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecPolicyUsesCleartextTrafficTrueTestCases
index 40d020f..b1cb390 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecPolicyUsesCleartextTrafficTrueTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecPolicyUsesCleartextTrafficTrueTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsNetSecPolicyUsesCleartextTrafficTrueTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases
index a89f274..425fe9a 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNetTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsNetTestCases
index 951140b..ff6526f 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNetTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNetTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsNetTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
@@ -36,4 +35,4 @@
 ],
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNetTestCasesLegacyApi22 b/server/site_tests/cheets_CTS_N/control.x86.CtsNetTestCasesLegacyApi22
index aa811d5..1405afb 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNetTestCasesLegacyApi22
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNetTestCasesLegacyApi22
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsNetTestCasesLegacyApi22 of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNetTestCasesLegacyPermission22 b/server/site_tests/cheets_CTS_N/control.x86.CtsNetTestCasesLegacyPermission22
index e929d60..8112e90 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNetTestCasesLegacyPermission22
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNetTestCasesLegacyPermission22
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsNetTestCasesLegacyPermission22 of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsOpenGLTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsOpenGLTestCases
index 4b091b8..b2d6e57 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsOpenGLTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsOpenGLTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsOpenGLTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsOpenGlPerf2TestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsOpenGlPerf2TestCases
index f2c1d30..c71eeb3 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsOpenGlPerf2TestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsOpenGlPerf2TestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsOpenGlPerf2TestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsOpenGlPerfTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsOpenGlPerfTestCases
index f85b497..889fd12 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsOpenGlPerfTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsOpenGlPerfTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsOpenGlPerfTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsOsHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsOsHostTestCases
index 704f4c2..41eaa24 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsOsHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsOsHostTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsOsHostTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsOsTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsOsTestCases
index bb58128..0858bbf 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsOsTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsOsTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsOsTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsPermission2TestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsPermission2TestCases
index dc6f4fc..41fcce2 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsPermission2TestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsPermission2TestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsPermission2TestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsPermissionTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsPermissionTestCases
index 29e8a46..6098c9f 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsPermissionTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsPermissionTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsPermissionTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsPreference2TestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsPreference2TestCases
index fd8decf..1d67cce 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsPreference2TestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsPreference2TestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsPreference2TestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsPreferenceTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsPreferenceTestCases
index cfb2481..95a3487 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsPreferenceTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsPreferenceTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsPreferenceTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsPrintTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsPrintTestCases
index 34ddb5e..2d27c7f 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsPrintTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsPrintTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsPrintTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsProviderTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsProviderTestCases
index 7a3e3a8..90a0817 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsProviderTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsProviderTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsProviderTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsRenderscriptLegacyTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsRenderscriptLegacyTestCases
index 7cce9b8..eab3cf9 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsRenderscriptLegacyTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsRenderscriptLegacyTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsRenderscriptLegacyTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsRenderscriptTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsRenderscriptTestCases
index d1e025a..8a03146 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsRenderscriptTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsRenderscriptTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsRenderscriptTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsRetailDemoHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsRetailDemoHostTestCases
index 8a935c6..ef7807f 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsRetailDemoHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsRetailDemoHostTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsRetailDemoHostTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsRsBlasTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsRsBlasTestCases
index b0e4148..bbcf80a 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsRsBlasTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsRsBlasTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsRsBlasTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsRsCppTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsRsCppTestCases
index 4a84605..f4aaf96 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsRsCppTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsRsCppTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsRsCppTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsSampleDeviceTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsSampleDeviceTestCases
index 0751e1e..7aa138d 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsSampleDeviceTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsSampleDeviceTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsSampleDeviceTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsSampleHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsSampleHostTestCases
index 09d9568..7574945 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsSampleHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsSampleHostTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsSampleHostTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsSaxTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsSaxTestCases
index c84ff06..f94cbfe 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsSaxTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsSaxTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsSaxTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsSecurityHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsSecurityHostTestCases
index d73af7e..b41975b 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsSecurityHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsSecurityHostTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsSecurityHostTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
@@ -23,7 +22,7 @@
         'cheets_CTS_N',
         host=host,
         iterations=1,
-        max_retry=3,
+        max_retry=10,
         needs_push_media=False,
         tag='CtsSecurityHostTestCases',
         target_module='CtsSecurityHostTestCases',
@@ -33,4 +32,4 @@
         precondition_commands=['echo 3 > /proc/sys/kernel/perf_event_paranoid'],
         timeout=5400)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsSecurityTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsSecurityTestCases
index ff52b2a..65c1836 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsSecurityTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsSecurityTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsSecurityTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsServicesHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsServicesHostTestCases
index 345a10c..e14e19f 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsServicesHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsServicesHostTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsServicesHostTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsShortcutHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsShortcutHostTestCases
index 8cc04d2..f08b7bc 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsShortcutHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsShortcutHostTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsShortcutHostTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsShortcutManagerTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsShortcutManagerTestCases
index 5197df1..0c0a715 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsShortcutManagerTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsShortcutManagerTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsShortcutManagerTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsSignatureTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsSignatureTestCases
index b1be2a4..46e8567 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsSignatureTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsSignatureTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsSignatureTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsSimpleCpuTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsSimpleCpuTestCases
index 0ac5244..8a69d88 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsSimpleCpuTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsSimpleCpuTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsSimpleCpuTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsSimpleperfTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsSimpleperfTestCases
index 01164f1..baeee3f 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsSimpleperfTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsSimpleperfTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsSimpleperfTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsSpeechTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsSpeechTestCases
index f13dbcb..65b416c 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsSpeechTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsSpeechTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsSpeechTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsSustainedPerformanceHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsSustainedPerformanceHostTestCases
index fbfd758..b0909c0 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsSustainedPerformanceHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsSustainedPerformanceHostTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsSustainedPerformanceHostTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsSystemIntentTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsSystemIntentTestCases
index 08f1429..0f08c1a 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsSystemIntentTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsSystemIntentTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsSystemIntentTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsSystemUiHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsSystemUiHostTestCases
index 53e408a..562502d 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsSystemUiHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsSystemUiHostTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsSystemUiHostTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsSystemUiTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsSystemUiTestCases
index 4a45092..ba917ce 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsSystemUiTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsSystemUiTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsSystemUiTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsTelecomTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsTelecomTestCases
index 1ff79de..12c1b55 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsTelecomTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsTelecomTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsTelecomTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsTelecomTestCases2 b/server/site_tests/cheets_CTS_N/control.x86.CtsTelecomTestCases2
index b1e40fd..8b999c2 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsTelecomTestCases2
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsTelecomTestCases2
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsTelecomTestCases2 of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsTelephony2TestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsTelephony2TestCases
index 36245d5..27e136f 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsTelephony2TestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsTelephony2TestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsTelephony2TestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsTelephonyTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsTelephonyTestCases
index f6c3c0f..7b3ef5d 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsTelephonyTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsTelephonyTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsTelephonyTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsTextTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsTextTestCases
index db4a5cf..5770acc 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsTextTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsTextTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsTextTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsTextureViewTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsTextureViewTestCases
index 7e52d11..d3fb8d7 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsTextureViewTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsTextureViewTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsTextureViewTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsThemeDeviceTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsThemeDeviceTestCases
index 640fe81..3905424 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsThemeDeviceTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsThemeDeviceTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsThemeDeviceTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsThemeHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsThemeHostTestCases
index 8ad4808..d0f04e7 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsThemeHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsThemeHostTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsThemeHostTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsToastLegacyTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsToastLegacyTestCases
index b33a933..520b7e4 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsToastLegacyTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsToastLegacyTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsToastLegacyTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsToastTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsToastTestCases
index afdc5db..814af4f 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsToastTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsToastTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsToastTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsTransitionTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsTransitionTestCases
index 49a1f28..8102ed8 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsTransitionTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsTransitionTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsTransitionTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsTrustedVoiceHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsTrustedVoiceHostTestCases
index 382de33..4e3c437 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsTrustedVoiceHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsTrustedVoiceHostTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsTrustedVoiceHostTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsTvProviderTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsTvProviderTestCases
index cbd33ce..e001f09 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsTvProviderTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsTvProviderTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsTvProviderTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsTvTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsTvTestCases
index ab0f7e2..f042bd8 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsTvTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsTvTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsTvTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsUiAutomationTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsUiAutomationTestCases
index aa00b53..2c803a0 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsUiAutomationTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsUiAutomationTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsUiAutomationTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsUiDeviceTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsUiDeviceTestCases
index 9fc6d68..90e902a 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsUiDeviceTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsUiDeviceTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsUiDeviceTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsUiHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsUiHostTestCases
index 1261d62..e947a85 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsUiHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsUiHostTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsUiHostTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsUiRenderingTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsUiRenderingTestCases
index 8631901..761431f 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsUiRenderingTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsUiRenderingTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsUiRenderingTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsUidIsolationTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsUidIsolationTestCases
index 427020a..fef013b 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsUidIsolationTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsUidIsolationTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsUidIsolationTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsUsageStatsTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsUsageStatsTestCases
index 1977a6c..72024d1 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsUsageStatsTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsUsageStatsTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsUsageStatsTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
@@ -36,4 +35,4 @@
 ],
         timeout=3600)
 
-parallel_simple(run_CTS, machines)
\ No newline at end of file
+parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsUsbTests b/server/site_tests/cheets_CTS_N/control.x86.CtsUsbTests
index 65c26bb..ef2f1cf 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsUsbTests
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsUsbTests
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsUsbTests of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsUtilTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsUtilTestCases
index c7ca17c..535bdc6 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsUtilTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsUtilTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsUtilTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsVideoTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsVideoTestCases
index 26bbd6f..576a74f 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsVideoTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsVideoTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsVideoTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsViewTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsViewTestCases
index a47ccea..195d531 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsViewTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsViewTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsViewTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsVmTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsVmTestCases
index 6abefab..f560a91 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsVmTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsVmTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsVmTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsVoiceInteractionTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsVoiceInteractionTestCases
index 92e4646..ac3c446 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsVoiceInteractionTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsVoiceInteractionTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsVoiceInteractionTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsVoiceSettingsTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsVoiceSettingsTestCases
index 5c9c703..658b342 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsVoiceSettingsTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsVoiceSettingsTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsVoiceSettingsTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsVrTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsVrTestCases
index ed5df53..6a76ecd 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsVrTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsVrTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsVrTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsWebkitTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsWebkitTestCases
index f169b88..e6dd49c 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsWebkitTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsWebkitTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsWebkitTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsWidgetTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsWidgetTestCases
index a7c285d..b02679a 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsWidgetTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsWidgetTestCases
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module CtsWidgetTestCases of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)
diff --git a/server/site_tests/cheets_CTS_N/control.x86.vm-tests-tf b/server/site_tests/cheets_CTS_N/control.x86.vm-tests-tf
index c7c7f5b..ba0626d 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.vm-tests-tf
+++ b/server/site_tests/cheets_CTS_N/control.x86.vm-tests-tf
@@ -10,12 +10,11 @@
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 2
 TEST_TYPE = 'server'
-TIME = 'LENGTHY'
+TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 307200
 
 DOC = ('Run module vm-tests-tf of the '
-       'Android 7.1_r12 Compatibility Test Suite (CTS), build 4439252,'
-       'using x86 ABI in the ARC++ container.')
+       'Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
     host = hosts.create_host(machine)