[autotest] Rev the CTS version for public CTS tests.

Regular change to the version of CTS the public control files
execute.

BUG=b:37922023
TEST=None - generated control files.

Change-Id: I174f583e7f088e2403bf54a25dac39c1e1eed482
Reviewed-on: https://chromium-review.googlesource.com/494796
Reviewed-by: Keith Haddow <haddowk@chromium.org>
Reviewed-by: Ilja H. Friedel <ihf@chromium.org>
Commit-Queue: Keith Haddow <haddowk@chromium.org>
Tested-by: Keith Haddow <haddowk@chromium.org>
Trybot-Ready: Keith Haddow <haddowk@chromium.org>
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 1fafe4e..3838d10 100644
--- a/server/site_tests/cheets_CTS_N/cheets_CTS_N.py
+++ b/server/site_tests/cheets_CTS_N/cheets_CTS_N.py
@@ -28,8 +28,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_r4-linux_x86-arm.zip',
-    'x86': _DL_CTS + 'android-cts-7.1_r4-linux_x86-x86.zip',
+    'arm': _DL_CTS + 'android-cts-7.1_r5-linux_x86-arm.zip',
+    'x86': _DL_CTS + 'android-cts-7.1_r5-linux_x86-x86.zip',
     'media': _DL_CTS + 'android-cts-media-1.2.zip',
 }
 
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAadbHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAadbHostTestCases
index b30a600..8000252 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsAadbHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsAadbHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsAadbHostTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAbiOverrideHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAbiOverrideHostTestCases
index 7cac1c0..f347867 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsAbiOverrideHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsAbiOverrideHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsAbiOverrideHostTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAccelerationTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAccelerationTestCases
index 70b0df3..ebb8b8e 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsAccelerationTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsAccelerationTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsAccelerationTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAccessibilityServiceTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAccessibilityServiceTestCases
index c36a464..e4af983 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsAccessibilityServiceTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsAccessibilityServiceTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsAccessibilityServiceTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAccessibilityTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAccessibilityTestCases
index 1fa5f45..19f5216 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsAccessibilityTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsAccessibilityTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsAccessibilityTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAccountManagerTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAccountManagerTestCases
index 95e5efc..fcd76b6 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsAccountManagerTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsAccountManagerTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsAccountManagerTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAdminTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAdminTestCases
index 0997f0f..e9d6b8d 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsAdminTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsAdminTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsAdminTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAlarmClockTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAlarmClockTestCases
index c3c0209..46ec63e 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsAlarmClockTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsAlarmClockTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsAlarmClockTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAndroidAppTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAndroidAppTestCases
index 603fd16..a82fb6c 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsAndroidAppTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsAndroidAppTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsAndroidAppTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAnimationTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAnimationTestCases
index ce0d3fe..e341259 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsAnimationTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsAnimationTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsAnimationTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAppSecurityHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAppSecurityHostTestCases
index 176e900..a08211c 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsAppSecurityHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsAppSecurityHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsAppSecurityHostTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
@@ -27,6 +27,6 @@
         tag='CtsAppSecurityHostTestCases',
         target_module='CtsAppSecurityHostTestCases',
         bundle='arm',
-        timeout=5400.0)
+        timeout=5400)
 
 parallel_simple(run_CTS, machines)
\ No newline at end of file
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAppTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAppTestCases
index 69f2b1e..bd0456d 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsAppTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsAppTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsAppTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAppUsageHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAppUsageHostTestCases
index 4869c92..efec9c2 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsAppUsageHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsAppUsageHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsAppUsageHostTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAppWidgetTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAppWidgetTestCases
index 411ac7b..226c6f3 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsAppWidgetTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsAppWidgetTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsAppWidgetTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAslrMallocTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAslrMallocTestCases
index 58c7d64..c785c6c 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsAslrMallocTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsAslrMallocTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsAslrMallocTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAssistTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAssistTestCases
index 99669ce..4911a84 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsAssistTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsAssistTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsAssistTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAtraceHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAtraceHostTestCases
index 5cb9129..4a51c7c 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsAtraceHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsAtraceHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsAtraceHostTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsBackupTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsBackupTestCases
index 2f5ec67..854c49c 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsBackupTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsBackupTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsBackupTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsBionicTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsBionicTestCases
index 197aa83..dd89309 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsBionicTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsBionicTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsBionicTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsBluetoothTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsBluetoothTestCases
index 393a91b..c3d223b 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsBluetoothTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsBluetoothTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsBluetoothTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsCalendarcommon2TestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsCalendarcommon2TestCases
index 9a9bbd6..ecfda51 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsCalendarcommon2TestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsCalendarcommon2TestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsCalendarcommon2TestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsCallLogTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsCallLogTestCases
index 81fdae6..465528a 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsCallLogTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsCallLogTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsCallLogTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsCameraTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsCameraTestCases
index 57295aa..dcab904 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsCameraTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsCameraTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsCameraTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsCarTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsCarTestCases
index 1f3d336..6d6d499 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsCarTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsCarTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsCarTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsCarrierApiTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsCarrierApiTestCases
index 1332468..94be6b5 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsCarrierApiTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsCarrierApiTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsCarrierApiTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsCompilationTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsCompilationTestCases
index dc1b175..44512c2 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsCompilationTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsCompilationTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsCompilationTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsContentTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsContentTestCases
index 0973b5d..d2afe55 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsContentTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsContentTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsContentTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsCppToolsTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsCppToolsTestCases
index eab5cef..24e36ea 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsCppToolsTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsCppToolsTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsCppToolsTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsDatabaseTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsDatabaseTestCases
index b9b7b67..7d14382 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsDatabaseTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsDatabaseTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsDatabaseTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsDeqpTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsDeqpTestCases
index 3842bb2..5b8b2f9 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsDeqpTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsDeqpTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsDeqpTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
@@ -27,6 +27,6 @@
         tag='CtsDeqpTestCases',
         target_module='CtsDeqpTestCases',
         bundle='arm',
-        timeout=86400.0)
+        timeout=86400)
 
 parallel_simple(run_CTS, machines)
\ No newline at end of file
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsDeviceAdminUninstallerTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsDeviceAdminUninstallerTestCases
index 4bda798..53fab56 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsDeviceAdminUninstallerTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsDeviceAdminUninstallerTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsDeviceAdminUninstallerTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsDevicePolicyManagerTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsDevicePolicyManagerTestCases
index cfea603..57fb5e9 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsDevicePolicyManagerTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsDevicePolicyManagerTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsDevicePolicyManagerTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
@@ -27,6 +27,6 @@
         tag='CtsDevicePolicyManagerTestCases',
         target_module='CtsDevicePolicyManagerTestCases',
         bundle='arm',
-        timeout=7200.0)
+        timeout=7200)
 
 parallel_simple(run_CTS, machines)
\ No newline at end of file
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsDisplayTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsDisplayTestCases
index 74cb678..c180158 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsDisplayTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsDisplayTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsDisplayTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsDpiTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsDpiTestCases
index 3a8a9da..6e637fe 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsDpiTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsDpiTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsDpiTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsDpiTestCases2 b/server/site_tests/cheets_CTS_N/control.arm.CtsDpiTestCases2
index bed0df3..2e6270f 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsDpiTestCases2
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsDpiTestCases2
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsDpiTestCases2 of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsDragAndDropHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsDragAndDropHostTestCases
index 76c547c..c7fc0f5 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsDragAndDropHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsDragAndDropHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsDragAndDropHostTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsDramTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsDramTestCases
index f1322a7..a59ab9a 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsDramTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsDramTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsDramTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsDreamsTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsDreamsTestCases
index 7ab751c..d23f5af 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsDreamsTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsDreamsTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsDreamsTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsDrmTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsDrmTestCases
index 5468ab7..d8c578d 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsDrmTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsDrmTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsDrmTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsDumpsysHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsDumpsysHostTestCases
index de8c1ce..be0f454 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsDumpsysHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsDumpsysHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsDumpsysHostTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsEffectTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsEffectTestCases
index e966379..7f4deeb 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsEffectTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsEffectTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsEffectTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsExternalServiceTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsExternalServiceTestCases
index beb4ac4..4ac85d6 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsExternalServiceTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsExternalServiceTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsExternalServiceTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsFileSystemTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsFileSystemTestCases
index 3a38072..42817bc 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsFileSystemTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsFileSystemTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsFileSystemTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
@@ -27,6 +27,6 @@
         tag='CtsFileSystemTestCases',
         target_module='CtsFileSystemTestCases',
         bundle='arm',
-        timeout=7200.0)
+        timeout=7200)
 
 parallel_simple(run_CTS, machines)
\ No newline at end of file
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsFragmentTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsFragmentTestCases
index 3d64435..a695427 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsFragmentTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsFragmentTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsFragmentTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsGestureTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsGestureTestCases
index cf8023a..c774591 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsGestureTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsGestureTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsGestureTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsGraphics2TestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsGraphics2TestCases
index 6a8de08..3da44f2 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsGraphics2TestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsGraphics2TestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsGraphics2TestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsGraphicsTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsGraphicsTestCases
index 1bbdd48..d957740 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsGraphicsTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsGraphicsTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsGraphicsTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsHardwareTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsHardwareTestCases
index a8aeda9..ae98442 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsHardwareTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsHardwareTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsHardwareTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
@@ -27,6 +27,6 @@
         tag='CtsHardwareTestCases',
         target_module='CtsHardwareTestCases',
         bundle='arm',
-        timeout=10800.0)
+        timeout=10800)
 
 parallel_simple(run_CTS, machines)
\ No newline at end of file
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsHostsideNetworkTests b/server/site_tests/cheets_CTS_N/control.arm.CtsHostsideNetworkTests
index aa2a2ad..1b6697f 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsHostsideNetworkTests
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsHostsideNetworkTests
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsHostsideNetworkTests of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsHostsideNumberBlockingTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsHostsideNumberBlockingTestCases
index 62ec4f1..513fd07 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsHostsideNumberBlockingTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsHostsideNumberBlockingTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsHostsideNumberBlockingTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsHostsideTvTests b/server/site_tests/cheets_CTS_N/control.arm.CtsHostsideTvTests
index c7de43f..6473218 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsHostsideTvTests
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsHostsideTvTests
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsHostsideTvTests of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsIcuTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsIcuTestCases
index c4f663a..5709064 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsIcuTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsIcuTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsIcuTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
@@ -27,6 +27,6 @@
         tag='CtsIcuTestCases',
         target_module='CtsIcuTestCases',
         bundle='arm',
-        timeout=7200.0)
+        timeout=7200)
 
 parallel_simple(run_CTS, machines)
\ No newline at end of file
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsJankDeviceTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsJankDeviceTestCases
index 236e895..9972206 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsJankDeviceTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsJankDeviceTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsJankDeviceTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsJdwpSecurityHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsJdwpSecurityHostTestCases
index c8abdda..89e7bd7 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsJdwpSecurityHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsJdwpSecurityHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsJdwpSecurityHostTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsJdwpTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsJdwpTestCases
index 2412f83..c639ed5 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsJdwpTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsJdwpTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsJdwpTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsJniTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsJniTestCases
index ab38fe4..e617045 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsJniTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsJniTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsJniTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsJobSchedulerTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsJobSchedulerTestCases
index 693a4f7..6a6967c 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsJobSchedulerTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsJobSchedulerTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsJobSchedulerTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsKeystoreTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsKeystoreTestCases
index c2e0121..065687c 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsKeystoreTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsKeystoreTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsKeystoreTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsLeanbackJankTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsLeanbackJankTestCases
index f968b4e..0a79063 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsLeanbackJankTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsLeanbackJankTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsLeanbackJankTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreLegacy22TestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreLegacy22TestCases
index ee3ce61..218b809 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreLegacy22TestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreLegacy22TestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsLibcoreLegacy22TestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreOjTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreOjTestCases
index be062a9..ae672b3 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreOjTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreOjTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsLibcoreOjTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
@@ -27,6 +27,6 @@
         tag='CtsLibcoreOjTestCases',
         target_module='CtsLibcoreOjTestCases',
         bundle='arm',
-        timeout=5400.0)
+        timeout=5400)
 
 parallel_simple(run_CTS, machines)
\ No newline at end of file
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreOkHttpTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreOkHttpTestCases
index 9c37f24..48863e6 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreOkHttpTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreOkHttpTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsLibcoreOkHttpTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreTestCases
index e15246d..2844068 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsLibcoreTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
@@ -27,6 +27,6 @@
         tag='CtsLibcoreTestCases',
         target_module='CtsLibcoreTestCases',
         bundle='arm',
-        timeout=5400.0)
+        timeout=5400)
 
 parallel_simple(run_CTS, machines)
\ No newline at end of file
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsLocation2TestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsLocation2TestCases
index 29501e5..197c285 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsLocation2TestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsLocation2TestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsLocation2TestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsLocationTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsLocationTestCases
index a93e691..0e7852e 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsLocationTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsLocationTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsLocationTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsMediaStressTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsMediaStressTestCases
index 5a18a0b..f948498 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsMediaStressTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsMediaStressTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsMediaStressTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
@@ -27,6 +27,6 @@
         tag='CtsMediaStressTestCases',
         target_module='CtsMediaStressTestCases',
         bundle='arm',
-        timeout=21600.0)
+        timeout=21600)
 
 parallel_simple(run_CTS, machines)
\ No newline at end of file
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsMediaTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsMediaTestCases
index 738f8df..a9cc3ad 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsMediaTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsMediaTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsMediaTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
@@ -27,6 +27,6 @@
         tag='CtsMediaTestCases',
         target_module='CtsMediaTestCases',
         bundle='arm',
-        timeout=21600.0)
+        timeout=21600)
 
 parallel_simple(run_CTS, machines)
\ No newline at end of file
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsMidiTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsMidiTestCases
index 540cef8..163a331 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsMidiTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsMidiTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsMidiTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsMonkeyTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsMonkeyTestCases
index dd9325c..4038fa7 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsMonkeyTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsMonkeyTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsMonkeyTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsMultiUserHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsMultiUserHostTestCases
index cd7e935..5a0438b 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsMultiUserHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsMultiUserHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsMultiUserHostTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsMultiUserTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsMultiUserTestCases
index af2e8e9..366e774 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsMultiUserTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsMultiUserTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsMultiUserTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNativeMediaSlTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsNativeMediaSlTestCases
index b587e73..556f4f4 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNativeMediaSlTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNativeMediaSlTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsNativeMediaSlTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNativeMediaXaTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsNativeMediaXaTestCases
index e1c767b..3e3895e 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNativeMediaXaTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNativeMediaXaTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsNativeMediaXaTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNdefTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsNdefTestCases
index 02e4953..92bed8c 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNdefTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNdefTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsNdefTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigAttributeTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigAttributeTestCases
index 5fa2b56..b733e98 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigAttributeTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigAttributeTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsNetSecConfigAttributeTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigBasicDebugDisabledTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigBasicDebugDisabledTestCases
index c729aa4..e6ac901 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigBasicDebugDisabledTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigBasicDebugDisabledTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsNetSecConfigBasicDebugDisabledTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigBasicDebugEnabledTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigBasicDebugEnabledTestCases
index 33aa597..e6e0cfb 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigBasicDebugEnabledTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigBasicDebugEnabledTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsNetSecConfigBasicDebugEnabledTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigBasicDomainConfigTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigBasicDomainConfigTestCases
index d991cec..768ed71 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigBasicDomainConfigTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigBasicDomainConfigTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsNetSecConfigBasicDomainConfigTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigCleartextTrafficTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigCleartextTrafficTestCases
index bfe237c..1350782 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigCleartextTrafficTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigCleartextTrafficTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsNetSecConfigCleartextTrafficTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigDownloadManagerTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigDownloadManagerTestCases
index dfd4f3f..b21be7f 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigDownloadManagerTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigDownloadManagerTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsNetSecConfigDownloadManagerTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigInvalidPinTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigInvalidPinTestCases
index 75742bd..9a98ac0 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigInvalidPinTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigInvalidPinTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsNetSecConfigInvalidPinTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigNestedDomainConfigTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigNestedDomainConfigTestCases
index 352cc8d..95bed9d 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigNestedDomainConfigTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigNestedDomainConfigTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsNetSecConfigNestedDomainConfigTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigResourcesSrcTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigResourcesSrcTestCases
index 6c67563..861d0d2 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigResourcesSrcTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecConfigResourcesSrcTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsNetSecConfigResourcesSrcTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecPolicyUsesCleartextTrafficFalseTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecPolicyUsesCleartextTrafficFalseTestCases
index 41c8b33..ef143e5 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecPolicyUsesCleartextTrafficFalseTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecPolicyUsesCleartextTrafficFalseTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsNetSecPolicyUsesCleartextTrafficFalseTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecPolicyUsesCleartextTrafficTrueTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecPolicyUsesCleartextTrafficTrueTestCases
index 289fd26..c96f1fc 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecPolicyUsesCleartextTrafficTrueTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecPolicyUsesCleartextTrafficTrueTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsNetSecPolicyUsesCleartextTrafficTrueTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases
index 3fe748d..935ef8f 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNetTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsNetTestCases
index 3e675e7..a2895c5 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNetTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNetTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsNetTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNetTestCasesLegacyApi22 b/server/site_tests/cheets_CTS_N/control.arm.CtsNetTestCasesLegacyApi22
index ba60c9f..78b6bfa 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNetTestCasesLegacyApi22
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNetTestCasesLegacyApi22
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsNetTestCasesLegacyApi22 of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsNetTestCasesLegacyPermission22 b/server/site_tests/cheets_CTS_N/control.arm.CtsNetTestCasesLegacyPermission22
index 92212e0..23c3fd4 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsNetTestCasesLegacyPermission22
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsNetTestCasesLegacyPermission22
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsNetTestCasesLegacyPermission22 of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsOpenGLTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsOpenGLTestCases
index a3c4219..8cca4d7 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsOpenGLTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsOpenGLTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsOpenGLTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsOpenGlPerf2TestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsOpenGlPerf2TestCases
index f8a2a49..c06a6b6 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsOpenGlPerf2TestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsOpenGlPerf2TestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsOpenGlPerf2TestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsOpenGlPerfTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsOpenGlPerfTestCases
index b74f88f..bc3e668 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsOpenGlPerfTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsOpenGlPerfTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsOpenGlPerfTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsOsHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsOsHostTestCases
index ff88151..95420e3 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsOsHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsOsHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsOsHostTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsOsTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsOsTestCases
index a087f5a..77d1de8 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsOsTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsOsTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsOsTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsPermission2TestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsPermission2TestCases
index 5d8a921..b746ffe 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsPermission2TestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsPermission2TestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsPermission2TestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsPermissionTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsPermissionTestCases
index 024b789..2106172 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsPermissionTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsPermissionTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsPermissionTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsPreference2TestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsPreference2TestCases
index 1c1b584..efac0c4 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsPreference2TestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsPreference2TestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsPreference2TestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsPreferenceTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsPreferenceTestCases
index 60a64c4..4020f3a 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsPreferenceTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsPreferenceTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsPreferenceTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsPrintTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsPrintTestCases
index aab43a3..23c8391 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsPrintTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsPrintTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsPrintTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
@@ -27,6 +27,6 @@
         tag='CtsPrintTestCases',
         target_module='CtsPrintTestCases',
         bundle='arm',
-        timeout=10800.0)
+        timeout=10800)
 
 parallel_simple(run_CTS, machines)
\ No newline at end of file
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsProviderTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsProviderTestCases
index 1e5f05a..a1b9ccb 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsProviderTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsProviderTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsProviderTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsRenderscriptLegacyTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsRenderscriptLegacyTestCases
index e459058..ab188ef 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsRenderscriptLegacyTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsRenderscriptLegacyTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsRenderscriptLegacyTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsRenderscriptTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsRenderscriptTestCases
index 2db3f1a..9628b1a 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsRenderscriptTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsRenderscriptTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsRenderscriptTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsRetailDemoHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsRetailDemoHostTestCases
index 82b9bf1..f51cfbb 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsRetailDemoHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsRetailDemoHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsRetailDemoHostTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsRsBlasTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsRsBlasTestCases
index bbc6a53..f9bd9cf 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsRsBlasTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsRsBlasTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsRsBlasTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsRsCppTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsRsCppTestCases
index fbce024..cf6e92c 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsRsCppTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsRsCppTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsRsCppTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsSampleDeviceTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsSampleDeviceTestCases
index 78bf9bc..9089234 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsSampleDeviceTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsSampleDeviceTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsSampleDeviceTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsSampleHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsSampleHostTestCases
index 558010e..8ef15fd 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsSampleHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsSampleHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsSampleHostTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsSaxTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsSaxTestCases
index 4393b00..d3f5541 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsSaxTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsSaxTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsSaxTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsSecurityHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsSecurityHostTestCases
index d32c5e7..6eb69fc 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsSecurityHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsSecurityHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsSecurityHostTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
@@ -27,6 +27,6 @@
         tag='CtsSecurityHostTestCases',
         target_module='CtsSecurityHostTestCases',
         bundle='arm',
-        timeout=5400.0)
+        timeout=5400)
 
 parallel_simple(run_CTS, machines)
\ No newline at end of file
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsSecurityTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsSecurityTestCases
index eb209cb..f5d11f6 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsSecurityTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsSecurityTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsSecurityTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsServicesHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsServicesHostTestCases
index dba0b27..f186c04 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsServicesHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsServicesHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsServicesHostTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsShortcutHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsShortcutHostTestCases
index 2595cd9..90fa5b7 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsShortcutHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsShortcutHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsShortcutHostTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
@@ -27,6 +27,6 @@
         tag='CtsShortcutHostTestCases',
         target_module='CtsShortcutHostTestCases',
         bundle='arm',
-        timeout=5400.0)
+        timeout=5400)
 
 parallel_simple(run_CTS, machines)
\ No newline at end of file
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsShortcutManagerTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsShortcutManagerTestCases
index c8e3873..715422d 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsShortcutManagerTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsShortcutManagerTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsShortcutManagerTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsSignatureTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsSignatureTestCases
index df3c6ed..4274706 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsSignatureTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsSignatureTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsSignatureTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsSimpleCpuTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsSimpleCpuTestCases
index 4e3bbb7..5ffc4d1 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsSimpleCpuTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsSimpleCpuTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsSimpleCpuTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsSimpleperfTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsSimpleperfTestCases
index 6a6491a..3c5950a 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsSimpleperfTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsSimpleperfTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsSimpleperfTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsSpeechTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsSpeechTestCases
index 9470595..ed89c80 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsSpeechTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsSpeechTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsSpeechTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsSustainedPerformanceHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsSustainedPerformanceHostTestCases
index 94d7e6e..f9d791e 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsSustainedPerformanceHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsSustainedPerformanceHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsSustainedPerformanceHostTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsSystemIntentTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsSystemIntentTestCases
index 2e15d27..0231b9b 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsSystemIntentTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsSystemIntentTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsSystemIntentTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsSystemUiHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsSystemUiHostTestCases
index 5ad6758..4d5350e 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsSystemUiHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsSystemUiHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsSystemUiHostTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsSystemUiTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsSystemUiTestCases
index 592482d..b825503 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsSystemUiTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsSystemUiTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsSystemUiTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsTelecomTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsTelecomTestCases
index 35ed5fd..565a353 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsTelecomTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsTelecomTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsTelecomTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsTelecomTestCases2 b/server/site_tests/cheets_CTS_N/control.arm.CtsTelecomTestCases2
index da77e39..0f44106 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsTelecomTestCases2
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsTelecomTestCases2
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsTelecomTestCases2 of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsTelephony2TestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsTelephony2TestCases
index 696b173..76729e1 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsTelephony2TestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsTelephony2TestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsTelephony2TestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsTelephonyTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsTelephonyTestCases
index 5c330cb..bee1782 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsTelephonyTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsTelephonyTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsTelephonyTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsTextTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsTextTestCases
index cb2c057..84e6e5b 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsTextTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsTextTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsTextTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsTextureViewTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsTextureViewTestCases
index 82e68e1..1247aa0 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsTextureViewTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsTextureViewTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsTextureViewTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsThemeDeviceTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsThemeDeviceTestCases
index d8b7cf3..eeeaad0 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsThemeDeviceTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsThemeDeviceTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsThemeDeviceTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsThemeHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsThemeHostTestCases
index 10a02a3..18d09c6 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsThemeHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsThemeHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsThemeHostTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
@@ -27,6 +27,6 @@
         tag='CtsThemeHostTestCases',
         target_module='CtsThemeHostTestCases',
         bundle='arm',
-        timeout=21600.0)
+        timeout=21600)
 
 parallel_simple(run_CTS, machines)
\ No newline at end of file
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsToastLegacyTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsToastLegacyTestCases
index 5d60b09..74f31c6 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsToastLegacyTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsToastLegacyTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsToastLegacyTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsToastTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsToastTestCases
index 8822b97..99d2daf 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsToastTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsToastTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsToastTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsTransitionTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsTransitionTestCases
index 291bba1..c912f64 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsTransitionTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsTransitionTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsTransitionTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsTrustedVoiceHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsTrustedVoiceHostTestCases
index d54b142..2458b0d 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsTrustedVoiceHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsTrustedVoiceHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsTrustedVoiceHostTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsTvProviderTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsTvProviderTestCases
index 9ae55ee..8881ae1 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsTvProviderTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsTvProviderTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsTvProviderTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsTvTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsTvTestCases
index 305a3b5..0f236ed 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsTvTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsTvTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsTvTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsUiAutomationTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsUiAutomationTestCases
index c4cc05c..44a2cfa 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsUiAutomationTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsUiAutomationTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsUiAutomationTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsUiDeviceTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsUiDeviceTestCases
index d4fbb12..fd902f7 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsUiDeviceTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsUiDeviceTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsUiDeviceTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsUiHostTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsUiHostTestCases
index 4b72acb..2ae34ce 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsUiHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsUiHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsUiHostTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsUiRenderingTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsUiRenderingTestCases
index 2ae95a9..3be1beb 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsUiRenderingTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsUiRenderingTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsUiRenderingTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsUidIsolationTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsUidIsolationTestCases
index 3165995..0464592 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsUidIsolationTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsUidIsolationTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsUidIsolationTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsUsageStatsTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsUsageStatsTestCases
index 3100767..5e283f7 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsUsageStatsTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsUsageStatsTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsUsageStatsTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsUsbTests b/server/site_tests/cheets_CTS_N/control.arm.CtsUsbTests
index 0df7c1b..524471a 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsUsbTests
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsUsbTests
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsUsbTests of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsUtilTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsUtilTestCases
index 4af19d1..e4b2bdd 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsUtilTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsUtilTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsUtilTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsVideoTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsVideoTestCases
index dc30d88..a98859a 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsVideoTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsVideoTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsVideoTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsViewTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsViewTestCases
index 8749232..77d9bd8 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsViewTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsViewTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsViewTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsVmTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsVmTestCases
index 4a3a09b..63dc4a5 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsVmTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsVmTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsVmTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
@@ -27,6 +27,6 @@
         tag='CtsVmTestCases',
         target_module='CtsVmTestCases',
         bundle='arm',
-        timeout=5400.0)
+        timeout=5400)
 
 parallel_simple(run_CTS, machines)
\ No newline at end of file
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsVoiceInteractionTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsVoiceInteractionTestCases
index 88b9ceb..e4d6bd1 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsVoiceInteractionTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsVoiceInteractionTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsVoiceInteractionTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsVoiceSettingsTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsVoiceSettingsTestCases
index 4de6491..4ef175f 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsVoiceSettingsTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsVoiceSettingsTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsVoiceSettingsTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsVrTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsVrTestCases
index 690b488..71483c1 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsVrTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsVrTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsVrTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsWebkitTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsWebkitTestCases
index 59b9153..98a65ff 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsWebkitTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsWebkitTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsWebkitTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsWidgetTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsWidgetTestCases
index cb3228b..74afdb2 100644
--- a/server/site_tests/cheets_CTS_N/control.arm.CtsWidgetTestCases
+++ b/server/site_tests/cheets_CTS_N/control.arm.CtsWidgetTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsWidgetTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.all b/server/site_tests/cheets_CTS_N/control.arm.all
deleted file mode 100644
index 52b7594..0000000
--- a/server/site_tests/cheets_CTS_N/control.arm.all
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = 'ARC Team'
-NAME = 'cheets_CTS_N.arm.all'
-ATTRIBUTES = 'suite:arc-cts-stable, suite:arc-cts-beta'
-DEPENDENCIES = 'arc'
-TEST_TYPE = 'server'
-TIME = 'LENGTHY'
-
-DOC = ('Run all tests in the Compatibility Test Suite (CTS),'
-       'using arm ABI in the ARC container.')
-
-def run_CTS(machine):
-    host = hosts.create_host(machine)
-    job.run_test(
-        'cheets_CTS_N',
-        host=host,
-        iterations=1,
-        tag='all',
-        bundle='arm',
-        needs_push_media=True,
-        max_retry = 9,
-        timeout=3600 * 24 * 2)
-
-parallel_simple(run_CTS, machines)
\ No newline at end of file
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 0a9200b..e818515 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
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module vm-tests-tf of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
@@ -27,6 +27,6 @@
         tag='vm-tests-tf',
         target_module='vm-tests-tf',
         bundle='arm',
-        timeout=3600)
+        timeout=7200)
 
 parallel_simple(run_CTS, machines)
\ No newline at end of file
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAadbHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAadbHostTestCases
index 7287989..3f8e72d 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsAadbHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsAadbHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsAadbHostTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAbiOverrideHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAbiOverrideHostTestCases
index e5a3eb1..694f07d 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsAbiOverrideHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsAbiOverrideHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsAbiOverrideHostTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAccelerationTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAccelerationTestCases
index e1d5efe..d3f1f4c 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsAccelerationTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsAccelerationTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsAccelerationTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAccessibilityServiceTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAccessibilityServiceTestCases
index df63ff0..0129774 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsAccessibilityServiceTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsAccessibilityServiceTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsAccessibilityServiceTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAccessibilityTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAccessibilityTestCases
index 19635df..ce69a6b 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsAccessibilityTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsAccessibilityTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsAccessibilityTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAccountManagerTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAccountManagerTestCases
index 1e851cd..7cdbbc3 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsAccountManagerTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsAccountManagerTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsAccountManagerTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAdminTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAdminTestCases
index 1889940..6ffe3ab 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsAdminTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsAdminTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsAdminTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAlarmClockTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAlarmClockTestCases
index 5cf0d42..ac2c737 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsAlarmClockTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsAlarmClockTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsAlarmClockTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAndroidAppTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAndroidAppTestCases
index b5ec0ba..ff9e5b1 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsAndroidAppTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsAndroidAppTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsAndroidAppTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAnimationTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAnimationTestCases
index 120d58a..69d3564 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsAnimationTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsAnimationTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsAnimationTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAppSecurityHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAppSecurityHostTestCases
index e3de674..8056ba7 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsAppSecurityHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsAppSecurityHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsAppSecurityHostTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
@@ -27,6 +27,6 @@
         tag='CtsAppSecurityHostTestCases',
         target_module='CtsAppSecurityHostTestCases',
         bundle='x86',
-        timeout=5400.0)
+        timeout=5400)
 
 parallel_simple(run_CTS, machines)
\ No newline at end of file
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAppTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAppTestCases
index d2d3fcb..2282edc 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsAppTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsAppTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsAppTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAppUsageHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAppUsageHostTestCases
index 10a5b78..9716a3b 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsAppUsageHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsAppUsageHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsAppUsageHostTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAppWidgetTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAppWidgetTestCases
index 663acea..cfe9b82 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsAppWidgetTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsAppWidgetTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsAppWidgetTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAslrMallocTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAslrMallocTestCases
index ab5176e..f6ea814 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsAslrMallocTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsAslrMallocTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsAslrMallocTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAssistTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAssistTestCases
index 05db5d1..ed4864a 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsAssistTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsAssistTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsAssistTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAtraceHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAtraceHostTestCases
index 7a2ac5c..d058526 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsAtraceHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsAtraceHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsAtraceHostTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsBackupTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsBackupTestCases
index ac24b13..507ed58 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsBackupTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsBackupTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsBackupTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsBionicTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsBionicTestCases
index 16036f2..ba0b25a 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsBionicTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsBionicTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsBionicTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsBluetoothTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsBluetoothTestCases
index a3c34cd..a296572 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsBluetoothTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsBluetoothTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsBluetoothTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsCalendarcommon2TestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsCalendarcommon2TestCases
index 6fe79ba..e274c45 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsCalendarcommon2TestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsCalendarcommon2TestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsCalendarcommon2TestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsCallLogTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsCallLogTestCases
index f6754bb..0ea0f0f 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsCallLogTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsCallLogTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsCallLogTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsCameraTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsCameraTestCases
index 08d07e4..a8a509a 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsCameraTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsCameraTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsCameraTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsCarTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsCarTestCases
index 526bcbd..90bf000 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsCarTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsCarTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsCarTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsCarrierApiTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsCarrierApiTestCases
index d05e897..9c38875 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsCarrierApiTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsCarrierApiTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsCarrierApiTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsCompilationTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsCompilationTestCases
index 73de52c..ae697ec 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsCompilationTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsCompilationTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsCompilationTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsContentTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsContentTestCases
index f775f58..5717397 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsContentTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsContentTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsContentTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsCppToolsTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsCppToolsTestCases
index 753fa62..1db0e1b 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsCppToolsTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsCppToolsTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsCppToolsTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsDatabaseTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsDatabaseTestCases
index eaf2818..2eedfa7 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsDatabaseTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsDatabaseTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsDatabaseTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsDeqpTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsDeqpTestCases
index 632d947..219b337 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsDeqpTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsDeqpTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsDeqpTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
@@ -27,6 +27,6 @@
         tag='CtsDeqpTestCases',
         target_module='CtsDeqpTestCases',
         bundle='x86',
-        timeout=86400.0)
+        timeout=86400)
 
 parallel_simple(run_CTS, machines)
\ No newline at end of file
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsDeviceAdminUninstallerTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsDeviceAdminUninstallerTestCases
index 47e5046..a511a15 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsDeviceAdminUninstallerTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsDeviceAdminUninstallerTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsDeviceAdminUninstallerTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsDevicePolicyManagerTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsDevicePolicyManagerTestCases
index 822d05b..2e1dcd8 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsDevicePolicyManagerTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsDevicePolicyManagerTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsDevicePolicyManagerTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
@@ -27,6 +27,6 @@
         tag='CtsDevicePolicyManagerTestCases',
         target_module='CtsDevicePolicyManagerTestCases',
         bundle='x86',
-        timeout=7200.0)
+        timeout=7200)
 
 parallel_simple(run_CTS, machines)
\ No newline at end of file
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsDisplayTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsDisplayTestCases
index 9cd32d6..ccb061e 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsDisplayTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsDisplayTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsDisplayTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsDpiTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsDpiTestCases
index 22d2d69..fc6df09 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsDpiTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsDpiTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsDpiTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsDpiTestCases2 b/server/site_tests/cheets_CTS_N/control.x86.CtsDpiTestCases2
index 3eb3bdd..b64e219 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsDpiTestCases2
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsDpiTestCases2
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsDpiTestCases2 of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsDragAndDropHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsDragAndDropHostTestCases
index a62b828..e6375b2 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsDragAndDropHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsDragAndDropHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsDragAndDropHostTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsDramTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsDramTestCases
index e2a6c42..677e00a 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsDramTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsDramTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsDramTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsDreamsTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsDreamsTestCases
index 26817f4..391ed49 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsDreamsTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsDreamsTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsDreamsTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsDrmTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsDrmTestCases
index 0724381..57c30a9 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsDrmTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsDrmTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsDrmTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsDumpsysHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsDumpsysHostTestCases
index 8ad9d35..829e893 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsDumpsysHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsDumpsysHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsDumpsysHostTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsEffectTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsEffectTestCases
index 43343ba..68588d6 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsEffectTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsEffectTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsEffectTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsExternalServiceTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsExternalServiceTestCases
index 6c6a826..61efef6 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsExternalServiceTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsExternalServiceTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsExternalServiceTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsFileSystemTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsFileSystemTestCases
index 8ca0d2e..b2d8665 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsFileSystemTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsFileSystemTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsFileSystemTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
@@ -27,6 +27,6 @@
         tag='CtsFileSystemTestCases',
         target_module='CtsFileSystemTestCases',
         bundle='x86',
-        timeout=7200.0)
+        timeout=7200)
 
 parallel_simple(run_CTS, machines)
\ No newline at end of file
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsFragmentTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsFragmentTestCases
index 8f757e4..be17563 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsFragmentTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsFragmentTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsFragmentTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsGestureTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsGestureTestCases
index 2332c24..e9bad04 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsGestureTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsGestureTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsGestureTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsGraphics2TestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsGraphics2TestCases
index fd90af5..f6a3ba4 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsGraphics2TestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsGraphics2TestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsGraphics2TestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsGraphicsTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsGraphicsTestCases
index f09c176..daf1473 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsGraphicsTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsGraphicsTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsGraphicsTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsHardwareTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsHardwareTestCases
index d2839ca..c97f1e0 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsHardwareTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsHardwareTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsHardwareTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
@@ -27,6 +27,6 @@
         tag='CtsHardwareTestCases',
         target_module='CtsHardwareTestCases',
         bundle='x86',
-        timeout=10800.0)
+        timeout=10800)
 
 parallel_simple(run_CTS, machines)
\ No newline at end of file
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsHostsideNetworkTests b/server/site_tests/cheets_CTS_N/control.x86.CtsHostsideNetworkTests
index b10d4d8..e759f94 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsHostsideNetworkTests
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsHostsideNetworkTests
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsHostsideNetworkTests of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsHostsideNumberBlockingTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsHostsideNumberBlockingTestCases
index 968ca15..eb95a94 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsHostsideNumberBlockingTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsHostsideNumberBlockingTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsHostsideNumberBlockingTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsHostsideTvTests b/server/site_tests/cheets_CTS_N/control.x86.CtsHostsideTvTests
index ffbe166..05760e6 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsHostsideTvTests
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsHostsideTvTests
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsHostsideTvTests of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsIcuTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsIcuTestCases
index 5ec863a..519f8b3 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsIcuTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsIcuTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsIcuTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
@@ -27,6 +27,6 @@
         tag='CtsIcuTestCases',
         target_module='CtsIcuTestCases',
         bundle='x86',
-        timeout=7200.0)
+        timeout=7200)
 
 parallel_simple(run_CTS, machines)
\ No newline at end of file
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsJankDeviceTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsJankDeviceTestCases
index ab3cae4..ea2ab9d 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsJankDeviceTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsJankDeviceTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsJankDeviceTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsJdwpSecurityHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsJdwpSecurityHostTestCases
index 500d011..0e69470 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsJdwpSecurityHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsJdwpSecurityHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsJdwpSecurityHostTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsJdwpTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsJdwpTestCases
index c6c6416..d0d4675 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsJdwpTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsJdwpTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsJdwpTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsJniTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsJniTestCases
index 7df7ded..b50e15d 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsJniTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsJniTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsJniTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsJobSchedulerTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsJobSchedulerTestCases
index 6c5ee7b..b541ecd 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsJobSchedulerTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsJobSchedulerTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsJobSchedulerTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsKeystoreTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsKeystoreTestCases
index 70d3121..6ff2bbb 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsKeystoreTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsKeystoreTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsKeystoreTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsLeanbackJankTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsLeanbackJankTestCases
index 9224543..d909b68 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsLeanbackJankTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsLeanbackJankTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsLeanbackJankTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreLegacy22TestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreLegacy22TestCases
index 173c54a..8c9a982 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreLegacy22TestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreLegacy22TestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsLibcoreLegacy22TestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreOjTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreOjTestCases
index bbb8c2e..870c3b8 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreOjTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreOjTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsLibcoreOjTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
@@ -27,6 +27,6 @@
         tag='CtsLibcoreOjTestCases',
         target_module='CtsLibcoreOjTestCases',
         bundle='x86',
-        timeout=5400.0)
+        timeout=5400)
 
 parallel_simple(run_CTS, machines)
\ No newline at end of file
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreOkHttpTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreOkHttpTestCases
index 0d8fce1..61056b0 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreOkHttpTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreOkHttpTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsLibcoreOkHttpTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreTestCases
index 90f7daf..38bd9a2 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsLibcoreTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
@@ -27,6 +27,6 @@
         tag='CtsLibcoreTestCases',
         target_module='CtsLibcoreTestCases',
         bundle='x86',
-        timeout=5400.0)
+        timeout=5400)
 
 parallel_simple(run_CTS, machines)
\ No newline at end of file
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsLocation2TestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsLocation2TestCases
index 5c23d3a..dd329bb 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsLocation2TestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsLocation2TestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsLocation2TestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsLocationTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsLocationTestCases
index db6b340..3364dff 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsLocationTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsLocationTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsLocationTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsMediaStressTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsMediaStressTestCases
index 3d7f501..eac0a31 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsMediaStressTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsMediaStressTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsMediaStressTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
@@ -27,6 +27,6 @@
         tag='CtsMediaStressTestCases',
         target_module='CtsMediaStressTestCases',
         bundle='x86',
-        timeout=21600.0)
+        timeout=21600)
 
 parallel_simple(run_CTS, machines)
\ No newline at end of file
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsMediaTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsMediaTestCases
index 64111a2..a3d8196 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsMediaTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsMediaTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsMediaTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
@@ -27,6 +27,6 @@
         tag='CtsMediaTestCases',
         target_module='CtsMediaTestCases',
         bundle='x86',
-        timeout=21600.0)
+        timeout=21600)
 
 parallel_simple(run_CTS, machines)
\ No newline at end of file
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsMidiTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsMidiTestCases
index 8a4d3b4..a26de86 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsMidiTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsMidiTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsMidiTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsMonkeyTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsMonkeyTestCases
index 7cc5a74..cde9451 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsMonkeyTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsMonkeyTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsMonkeyTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsMultiUserHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsMultiUserHostTestCases
index 4774514..45a935c 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsMultiUserHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsMultiUserHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsMultiUserHostTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsMultiUserTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsMultiUserTestCases
index 91ef231..0c45f2a 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsMultiUserTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsMultiUserTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsMultiUserTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNativeMediaSlTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsNativeMediaSlTestCases
index 2a38d9a..d8b99ec 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNativeMediaSlTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNativeMediaSlTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsNativeMediaSlTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNativeMediaXaTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsNativeMediaXaTestCases
index 54202a0..029e8f9 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNativeMediaXaTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNativeMediaXaTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsNativeMediaXaTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNdefTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsNdefTestCases
index 4594bad..d76bbda 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNdefTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNdefTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsNdefTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigAttributeTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigAttributeTestCases
index 7876a11..059fa82 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigAttributeTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigAttributeTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsNetSecConfigAttributeTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigBasicDebugDisabledTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigBasicDebugDisabledTestCases
index 1cceaf6..5108cd3 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigBasicDebugDisabledTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigBasicDebugDisabledTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsNetSecConfigBasicDebugDisabledTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigBasicDebugEnabledTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigBasicDebugEnabledTestCases
index 32082e5..6467eab 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigBasicDebugEnabledTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigBasicDebugEnabledTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsNetSecConfigBasicDebugEnabledTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigBasicDomainConfigTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigBasicDomainConfigTestCases
index ac30d74..ef7f6c2 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigBasicDomainConfigTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigBasicDomainConfigTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsNetSecConfigBasicDomainConfigTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigCleartextTrafficTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigCleartextTrafficTestCases
index 25df459..2c78579 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigCleartextTrafficTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigCleartextTrafficTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsNetSecConfigCleartextTrafficTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigDownloadManagerTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigDownloadManagerTestCases
index 94b57cc..50e1c8e 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigDownloadManagerTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigDownloadManagerTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsNetSecConfigDownloadManagerTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigInvalidPinTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigInvalidPinTestCases
index 3c473b7..e45c288 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigInvalidPinTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigInvalidPinTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsNetSecConfigInvalidPinTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigNestedDomainConfigTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigNestedDomainConfigTestCases
index addafd5..47b873c 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigNestedDomainConfigTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigNestedDomainConfigTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsNetSecConfigNestedDomainConfigTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigResourcesSrcTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigResourcesSrcTestCases
index 52bd5fb..8e6b85c 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigResourcesSrcTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecConfigResourcesSrcTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsNetSecConfigResourcesSrcTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecPolicyUsesCleartextTrafficFalseTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecPolicyUsesCleartextTrafficFalseTestCases
index 8a526a0..6524c55 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecPolicyUsesCleartextTrafficFalseTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecPolicyUsesCleartextTrafficFalseTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsNetSecPolicyUsesCleartextTrafficFalseTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecPolicyUsesCleartextTrafficTrueTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecPolicyUsesCleartextTrafficTrueTestCases
index 6df74d6..1b6d601 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecPolicyUsesCleartextTrafficTrueTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecPolicyUsesCleartextTrafficTrueTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsNetSecPolicyUsesCleartextTrafficTrueTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases
index 5f9b9bf..70e74eb 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNetTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsNetTestCases
index ea34bd7..2d4c32e 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNetTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNetTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsNetTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNetTestCasesLegacyApi22 b/server/site_tests/cheets_CTS_N/control.x86.CtsNetTestCasesLegacyApi22
index 6d8c122..0d59992 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNetTestCasesLegacyApi22
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNetTestCasesLegacyApi22
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsNetTestCasesLegacyApi22 of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsNetTestCasesLegacyPermission22 b/server/site_tests/cheets_CTS_N/control.x86.CtsNetTestCasesLegacyPermission22
index ad12c95..b12a699 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsNetTestCasesLegacyPermission22
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsNetTestCasesLegacyPermission22
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsNetTestCasesLegacyPermission22 of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsOpenGLTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsOpenGLTestCases
index 5302931..e367f81 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsOpenGLTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsOpenGLTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsOpenGLTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsOpenGlPerf2TestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsOpenGlPerf2TestCases
index af0200b..9fecfc1 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsOpenGlPerf2TestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsOpenGlPerf2TestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsOpenGlPerf2TestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsOpenGlPerfTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsOpenGlPerfTestCases
index 8bb6e80..3a99e4b 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsOpenGlPerfTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsOpenGlPerfTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsOpenGlPerfTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsOsHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsOsHostTestCases
index 16348af..c3a633e 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsOsHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsOsHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsOsHostTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsOsTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsOsTestCases
index 9b44601..bba6017 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsOsTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsOsTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsOsTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsPermission2TestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsPermission2TestCases
index 3f288fb..c86ac97 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsPermission2TestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsPermission2TestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsPermission2TestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsPermissionTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsPermissionTestCases
index a758d9a..39634b9 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsPermissionTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsPermissionTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsPermissionTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsPreference2TestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsPreference2TestCases
index be85d0e..1b169e5 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsPreference2TestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsPreference2TestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsPreference2TestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsPreferenceTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsPreferenceTestCases
index f360101..5fadec2 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsPreferenceTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsPreferenceTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsPreferenceTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsPrintTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsPrintTestCases
index 957c947..be9b078 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsPrintTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsPrintTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsPrintTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
@@ -27,6 +27,6 @@
         tag='CtsPrintTestCases',
         target_module='CtsPrintTestCases',
         bundle='x86',
-        timeout=10800.0)
+        timeout=10800)
 
 parallel_simple(run_CTS, machines)
\ No newline at end of file
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsProviderTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsProviderTestCases
index ae3ba09..70976c7 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsProviderTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsProviderTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsProviderTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsRenderscriptLegacyTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsRenderscriptLegacyTestCases
index d12eecf..7880030 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsRenderscriptLegacyTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsRenderscriptLegacyTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsRenderscriptLegacyTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsRenderscriptTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsRenderscriptTestCases
index 729cf13..ac09887 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsRenderscriptTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsRenderscriptTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsRenderscriptTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsRetailDemoHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsRetailDemoHostTestCases
index d3915df..d800899 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsRetailDemoHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsRetailDemoHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsRetailDemoHostTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsRsBlasTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsRsBlasTestCases
index 7bbd44b..bf66392 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsRsBlasTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsRsBlasTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsRsBlasTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsRsCppTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsRsCppTestCases
index c1567d0..20ac2df 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsRsCppTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsRsCppTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsRsCppTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsSampleDeviceTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsSampleDeviceTestCases
index 0a21ac9..4727648 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsSampleDeviceTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsSampleDeviceTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsSampleDeviceTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsSampleHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsSampleHostTestCases
index cc2e037..d983d3a 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsSampleHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsSampleHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsSampleHostTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsSaxTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsSaxTestCases
index 2e281ca..9639bb2 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsSaxTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsSaxTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsSaxTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsSecurityHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsSecurityHostTestCases
index 2f689e3..544fcc4 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsSecurityHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsSecurityHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsSecurityHostTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
@@ -27,6 +27,6 @@
         tag='CtsSecurityHostTestCases',
         target_module='CtsSecurityHostTestCases',
         bundle='x86',
-        timeout=5400.0)
+        timeout=5400)
 
 parallel_simple(run_CTS, machines)
\ No newline at end of file
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsSecurityTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsSecurityTestCases
index 0997e70..f83eebf 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsSecurityTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsSecurityTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsSecurityTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsServicesHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsServicesHostTestCases
index a4ef5b3..0c41ae0 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsServicesHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsServicesHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsServicesHostTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsShortcutHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsShortcutHostTestCases
index 6d838b4..d24679e 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsShortcutHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsShortcutHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsShortcutHostTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
@@ -27,6 +27,6 @@
         tag='CtsShortcutHostTestCases',
         target_module='CtsShortcutHostTestCases',
         bundle='x86',
-        timeout=5400.0)
+        timeout=5400)
 
 parallel_simple(run_CTS, machines)
\ No newline at end of file
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsShortcutManagerTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsShortcutManagerTestCases
index 840785b..492fb8c 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsShortcutManagerTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsShortcutManagerTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsShortcutManagerTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsSignatureTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsSignatureTestCases
index b8b8728..499306c 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsSignatureTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsSignatureTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsSignatureTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsSimpleCpuTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsSimpleCpuTestCases
index ff92358..4ce473d 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsSimpleCpuTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsSimpleCpuTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsSimpleCpuTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsSimpleperfTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsSimpleperfTestCases
index 9dca1ac..394b703 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsSimpleperfTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsSimpleperfTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsSimpleperfTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsSpeechTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsSpeechTestCases
index faef930..ad7005c 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsSpeechTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsSpeechTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsSpeechTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsSustainedPerformanceHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsSustainedPerformanceHostTestCases
index 1c9cd67..d04a29c 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsSustainedPerformanceHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsSustainedPerformanceHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsSustainedPerformanceHostTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsSystemIntentTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsSystemIntentTestCases
index 3e4012c..8098b9e 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsSystemIntentTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsSystemIntentTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsSystemIntentTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsSystemUiHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsSystemUiHostTestCases
index c37c277..26de391 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsSystemUiHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsSystemUiHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsSystemUiHostTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsSystemUiTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsSystemUiTestCases
index a50ac32..f2c6f55 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsSystemUiTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsSystemUiTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsSystemUiTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsTelecomTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsTelecomTestCases
index 36255de..0d463b4 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsTelecomTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsTelecomTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsTelecomTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsTelecomTestCases2 b/server/site_tests/cheets_CTS_N/control.x86.CtsTelecomTestCases2
index 2d6a216..f9fda69 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsTelecomTestCases2
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsTelecomTestCases2
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsTelecomTestCases2 of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsTelephony2TestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsTelephony2TestCases
index 0f01256..09e2c50 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsTelephony2TestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsTelephony2TestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsTelephony2TestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsTelephonyTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsTelephonyTestCases
index 667c44b..a7e3c25 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsTelephonyTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsTelephonyTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsTelephonyTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsTextTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsTextTestCases
index d6995f3..4db0bab 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsTextTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsTextTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsTextTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsTextureViewTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsTextureViewTestCases
index 2d38e3b..0956c3d 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsTextureViewTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsTextureViewTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsTextureViewTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsThemeDeviceTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsThemeDeviceTestCases
index a078543..6bb92f3 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsThemeDeviceTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsThemeDeviceTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsThemeDeviceTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsThemeHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsThemeHostTestCases
index cf6d00e..6f3f895 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsThemeHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsThemeHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsThemeHostTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
@@ -27,6 +27,6 @@
         tag='CtsThemeHostTestCases',
         target_module='CtsThemeHostTestCases',
         bundle='x86',
-        timeout=21600.0)
+        timeout=21600)
 
 parallel_simple(run_CTS, machines)
\ No newline at end of file
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsToastLegacyTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsToastLegacyTestCases
index f54afb5..4af34c9 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsToastLegacyTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsToastLegacyTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsToastLegacyTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsToastTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsToastTestCases
index 1124989..2e7f4aa 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsToastTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsToastTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsToastTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsTransitionTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsTransitionTestCases
index 8884d3f..18bf434 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsTransitionTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsTransitionTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsTransitionTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsTrustedVoiceHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsTrustedVoiceHostTestCases
index 61203d5..28ac65f 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsTrustedVoiceHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsTrustedVoiceHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsTrustedVoiceHostTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsTvProviderTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsTvProviderTestCases
index 199c05f..12c7447 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsTvProviderTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsTvProviderTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsTvProviderTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsTvTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsTvTestCases
index cf3ea1d..7b5f35c 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsTvTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsTvTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsTvTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsUiAutomationTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsUiAutomationTestCases
index d9b6d78..649a9d0 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsUiAutomationTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsUiAutomationTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsUiAutomationTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsUiDeviceTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsUiDeviceTestCases
index 906b59a..fbcb04e 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsUiDeviceTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsUiDeviceTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsUiDeviceTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsUiHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsUiHostTestCases
index 88bcf2c..43d692f 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsUiHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsUiHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsUiHostTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsUiRenderingTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsUiRenderingTestCases
index 6a434f8..680ba84 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsUiRenderingTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsUiRenderingTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsUiRenderingTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsUidIsolationTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsUidIsolationTestCases
index ffee143..3333389 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsUidIsolationTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsUidIsolationTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsUidIsolationTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsUsageStatsTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsUsageStatsTestCases
index 0d0f976..8ed4c1d 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsUsageStatsTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsUsageStatsTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsUsageStatsTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsUsbTests b/server/site_tests/cheets_CTS_N/control.x86.CtsUsbTests
index 23572e2..c922cda 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsUsbTests
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsUsbTests
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsUsbTests of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsUtilTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsUtilTestCases
index 06c35a7..88f8c2a 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsUtilTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsUtilTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsUtilTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsVideoTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsVideoTestCases
index 128b0bc..c4250df 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsVideoTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsVideoTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsVideoTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsViewTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsViewTestCases
index c741fcb..2585008 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsViewTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsViewTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsViewTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsVmTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsVmTestCases
index 705d404..860f21b 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsVmTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsVmTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsVmTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
@@ -27,6 +27,6 @@
         tag='CtsVmTestCases',
         target_module='CtsVmTestCases',
         bundle='x86',
-        timeout=5400.0)
+        timeout=5400)
 
 parallel_simple(run_CTS, machines)
\ No newline at end of file
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsVoiceInteractionTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsVoiceInteractionTestCases
index 9ebf0a0..bc54496 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsVoiceInteractionTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsVoiceInteractionTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsVoiceInteractionTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsVoiceSettingsTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsVoiceSettingsTestCases
index d7bb6e8..c490c8f 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsVoiceSettingsTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsVoiceSettingsTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsVoiceSettingsTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsVrTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsVrTestCases
index ded5429..8b5a775 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsVrTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsVrTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsVrTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsWebkitTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsWebkitTestCases
index 6c59538..c055c17 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsWebkitTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsWebkitTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsWebkitTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsWidgetTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsWidgetTestCases
index 1ffb522..7af888d 100644
--- a/server/site_tests/cheets_CTS_N/control.x86.CtsWidgetTestCases
+++ b/server/site_tests/cheets_CTS_N/control.x86.CtsWidgetTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module CtsWidgetTestCases of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.all b/server/site_tests/cheets_CTS_N/control.x86.all
deleted file mode 100644
index 47ff6e0..0000000
--- a/server/site_tests/cheets_CTS_N/control.x86.all
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = 'ARC Team'
-NAME = 'cheets_CTS_N.x86.all'
-ATTRIBUTES = 'suite:arc-cts-stable, suite:arc-cts-beta'
-DEPENDENCIES = 'arc'
-TEST_TYPE = 'server'
-TIME = 'LENGTHY'
-
-DOC = ('Run all tests in the Compatibility Test Suite (CTS),'
-       'using arm ABI in the ARC container.')
-
-def run_CTS(machine):
-    host = hosts.create_host(machine)
-    job.run_test(
-        'cheets_CTS_N',
-        host=host,
-        iterations=1,
-        tag='all',
-        bundle='x86',
-        needs_push_media=True,
-        max_retry = 9,
-        timeout=3600 * 24 * 2)
-
-parallel_simple(run_CTS, machines)
\ No newline at end of file
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 3ce1c42..e802f26 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
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run module vm-tests-tf of the '
-       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
+       'Android 7.1_r5 Compatibility Test Suite (CTS), build 3943087,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
@@ -27,6 +27,6 @@
         tag='vm-tests-tf',
         target_module='vm-tests-tf',
         bundle='x86',
-        timeout=3600)
+        timeout=7200)
 
 parallel_simple(run_CTS, machines)
\ No newline at end of file