[autotest] Rev the public CTS N Suite to Rev 4

Title says it all, monthly update.

BUG=b:36978916
TEST=None

Change-Id: I03888e44e631763b14a8c8b6883ea74b46cf94b3
Reviewed-on: https://chromium-review.googlesource.com/471829
Reviewed-by: Ilja H. Friedel <ihf@chromium.org>
Tested-by: Ilja H. Friedel <ihf@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 3ce08da..8f9bf76 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_r3-linux_x86-arm.zip',
-    'x86': _DL_CTS + 'android-cts-7.1_r3-linux_x86-x86.zip',
+    'arm': _DL_CTS + 'android-cts-7.1_r4-linux_x86-arm.zip',
+    'x86': _DL_CTS + 'android-cts-7.1_r4-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 051d66f..b30a600 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 1fe53d2..7cac1c0 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 df43fc1..70b0df3 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 04d1ff7..c36a464 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 5da007f..1fa5f45 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 988aba9..95e5efc 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 a6c3fe9..0997f0f 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 17cacdd..c3c0209 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 91cbeba..603fd16 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 da4b8e1..ce0d3fe 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 2009370..176e900 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsAppTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsAppTestCases
index af69c22..69f2b1e 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 88c6866..4869c92 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 572cec3..411ac7b 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 ed5a2f4..58c7d64 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 a08615d..99669ce 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 f3e8b39..5cb9129 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 6f35ceb..2f5ec67 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 6e0fb89..197aa83 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 e38d097..393a91b 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 7e37ead..9a9bbd6 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 5d69f71..81fdae6 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 e692edf..57295aa 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 95b805b..1f3d336 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 426b645..1332468 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 0db6f7d..dc1b175 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 8db2e42..0973b5d 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 b31d7b5..eab5cef 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 8330e62..b9b7b67 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 1cc4c65..3842bb2 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsDeviceAdminUninstallerTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsDeviceAdminUninstallerTestCases
index c3a7fcc..4bda798 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 d167b24..cfea603 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsDisplayTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsDisplayTestCases
index fadf428..74cb678 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 61d58aa..3a8a9da 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 f3b88f6..bed0df3 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 7899cac..76c547c 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 4b168da..f1322a7 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 ec820c4..7ab751c 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 a3445ee..5468ab7 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 60702a2..de8c1ce 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 80fd4bd..e966379 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 a5c7ef1..beb4ac4 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 2814376..3a38072 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsFragmentTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsFragmentTestCases
index 82d73af..3d64435 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 47f713e..cf8023a 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 967653a..6a8de08 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 b28bbd2..1bbdd48 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 a394276..a8aeda9 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsHostsideNetworkTests b/server/site_tests/cheets_CTS_N/control.arm.CtsHostsideNetworkTests
index 5a55818..aa2a2ad 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 74e0572..62ec4f1 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 0850565..c7de43f 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 c6e1030..c4f663a 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsJankDeviceTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsJankDeviceTestCases
index 84bbbc2..236e895 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 752dbdd..c8abdda 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 b1ca529..2412f83 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 03ff39b..ab38fe4 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 4d4440c..693a4f7 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 1f32dff..c2e0121 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 0d5a7fc..f968b4e 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 b8b5343..ee3ce61 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 0022d8d..be062a9 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreOkHttpTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsLibcoreOkHttpTestCases
index 6ba2aa5..9c37f24 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 6a56eb9..e15246d 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsLocation2TestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsLocation2TestCases
index 1c31d86..29501e5 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 032bc49..a93e691 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 a140bf6..5a18a0b 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsMediaTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsMediaTestCases
index ccfe7c2..738f8df 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsMidiTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsMidiTestCases
index 6549ed4..540cef8 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 c86b8c3..dd9325c 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 8a47048..cd7e935 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 0a2f3c43..af2e8e9 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 b5d4f80..b587e73 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 7f98037..e1c767b 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 66d6694..02e4953 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 88cbf5e..5fa2b56 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 9948363..c729aa4 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 fb500b7..33aa597 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 2f77fd3..d991cec 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 380f2d2..bfe237c 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 536a04c..dfd4f3f 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 3d3a9cf..75742bd 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 5535724..352cc8d 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 ed6eb91..6c67563 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 623dd3a..41c8b33 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 553657f..289fd26 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 5ffc4dd..3fe748d 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 5b6a910..3e675e7 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 9f0223a..ba60c9f 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 038623a..92212e0 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 51dd7ba..a3c4219 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 d0dd56e..f8a2a49 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 e4526bd..b74f88f 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 25edad2..ff88151 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 6647feb..a087f5a 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 e9b2210..5d8a921 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 ffc6bca..024b789 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 a1c80fb..1c1b584 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 6d8d0be..60a64c4 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 53b8756..aab43a3 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsProviderTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsProviderTestCases
index 974ca20..1e5f05a 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 3c668a2..e459058 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 c75d57e..2db3f1a 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 23c2b84..82b9bf1 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 a6e71f8..bbc6a53 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 454a1fe..fbce024 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 1710941..78bf9bc 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 547ac5a..558010e 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 7005720..4393b00 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 1460342..d32c5e7 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsSecurityTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsSecurityTestCases
index 0ea86fc..eb209cb 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 f250d66..dba0b27 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 d5b229b..2595cd9 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsShortcutManagerTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsShortcutManagerTestCases
index d64f88d..c8e3873 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 a055cb2..df3c6ed 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 0940d92..4e3bbb7 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 7deeb71..6a6491a 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 e5ec35e..9470595 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 b959d8d..94d7e6e 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 b3a8c00..2e15d27 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 580231e..5ad6758 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 dd08dbd..592482d 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 b279678..35ed5fd 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 561f22a..da77e39 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 cc6428b..696b173 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 d0277ad..5c330cb 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 463269f..cb2c057 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 a92526b..82e68e1 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 6a464fc..d8b7cf3 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 c27a77f..10a02a3 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsToastLegacyTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsToastLegacyTestCases
index d322d82..5d60b09 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 fc5ce2b..8822b97 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 2dbea80..291bba1 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 c623b46..d54b142 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 8c67da9..9ae55ee 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 39d7847..305a3b5 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 537737c..c4cc05c 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 2d05edf..d4fbb12 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 a01485b..4b72acb 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 82306f6..2ae95a9 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 bb8086c..3165995 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 6d8d09b..3100767 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 af2e318..0df7c1b 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 cb48a6d..4af19d1 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 6faf812..dc30d88 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 ef5b978..8749232 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 5e1068e..4a3a09b 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.CtsVoiceInteractionTestCases b/server/site_tests/cheets_CTS_N/control.arm.CtsVoiceInteractionTestCases
index ddf8270..88b9ceb 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 01ab87b..4de6491 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 3c09d06..690b488 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 cef190a..59b9153 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 c100449..cb3228b 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.arm.vm-tests-tf b/server/site_tests/cheets_CTS_N/control.arm.vm-tests-tf
index bdebddc..0a9200b 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        'using arm ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAadbHostTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAadbHostTestCases
index 9a4ac31..7287989 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 4513699..e5a3eb1 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 613cc0f..e1d5efe 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 52a07f4..df63ff0 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 6a9e61e..19635df 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 6e81426..1e851cd 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 1b5fd56..1889940 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 2b20b30..5cf0d42 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 f40a55b..b5ec0ba 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 da2df1f..120d58a 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 fbe4194..e3de674 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsAppTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsAppTestCases
index ed2cec7..d2d3fcb 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 df06027..10a5b78 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 b6a784d..663acea 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 9eee84d..ab5176e 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 f16003b..05db5d1 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 1c73051..7a2ac5c 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 5ad745f..ac24b13 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 9f3575e..16036f2 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 7cbbf92..a3c34cd 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 4af88da..6fe79ba 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 032e7e1..f6754bb 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 9b966c8..08d07e4 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 6354d2e..526bcbd 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 92f46d3..d05e897 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 3b7208a..73de52c 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 c16ee8f..f775f58 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 b04418c..753fa62 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 7db9b72..eaf2818 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 8f8a805..632d947 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsDeviceAdminUninstallerTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsDeviceAdminUninstallerTestCases
index f947b82..47e5046 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 8df44d8..822d05b 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsDisplayTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsDisplayTestCases
index 2ef83ed..9cd32d6 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 a29b427..22d2d69 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 f947eab..3eb3bdd 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 5ac3d42..a62b828 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 fccc556..e2a6c42 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 f123f11..26817f4 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 f507c7f..0724381 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 1055a70..8ad9d35 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 fa9bea6..43343ba 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 5e1c2c1..6c6a826 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 a70b80d..8ca0d2e 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsFragmentTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsFragmentTestCases
index 9cbb84c..8f757e4 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 4b757fa..2332c24 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 05c9102..fd90af5 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 ff8bcb5..f09c176 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 196e9ca..d2839ca 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsHostsideNetworkTests b/server/site_tests/cheets_CTS_N/control.x86.CtsHostsideNetworkTests
index 9efa88f..b10d4d8 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 f9dec27..968ca15 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 f5aa3dd..ffbe166 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 e96f109..5ec863a 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsJankDeviceTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsJankDeviceTestCases
index 7560d16..ab3cae4 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 cc30611..500d011 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 c62446c..c6c6416 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 0455efe..7df7ded 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 9eb003e..6c5ee7b 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 aeb6776..70d3121 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 faf6be9..9224543 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 b187dbe..173c54a 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 59425b0..bbb8c2e 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreOkHttpTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsLibcoreOkHttpTestCases
index 632b2a3..0d8fce1 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 ebf82f1..90f7daf 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsLocation2TestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsLocation2TestCases
index c645684..5c23d3a 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 dbacf30..db6b340 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 5a84e4a..3d7f501 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsMediaTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsMediaTestCases
index 0c62ccc..64111a2 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsMidiTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsMidiTestCases
index 9bbf8ac..8a4d3b4 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 f5bf292..7cc5a74 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 b770242..4774514 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 ff10cbc..91ef231 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 9a86a9e..2a38d9a 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 7212f4a..54202a0 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 82323e1..4594bad 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 bb6178c..7876a11 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 48ea0d4..1cceaf6 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 b99bac3..32082e5 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 ff88f11..ac30d74 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 5e67e39..25df459 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 7492d00..94b57cc 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 e687fa9..3c473b7 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 1c940af..addafd5 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 082a7da..52bd5fb 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 dee6aa3..8a526a0 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 1b8f8d8..6df74d6 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 3f988b9..5f9b9bf 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 7e38bd9..ea34bd7 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 4ae767e..6d8c122 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 79933e0..ad12c95 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 4f58d0a..5302931 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 fbe7ab9..af0200b 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 a976be1..8bb6e80 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 d09fbf9..16348af 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 34a9a46..9b44601 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 c584340..3f288fb 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 40817e3..a758d9a 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 0587fb3..be85d0e 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 37f6b4f..f360101 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 9105434..957c947 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsProviderTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsProviderTestCases
index cec61de..ae3ba09 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 88a23e7..d12eecf 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 c130614..729cf13 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 dcd5959..d3915df 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 a91bb68..7bbd44b 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 50ba1ac..c1567d0 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 85e73b3..0a21ac9 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 a582545..cc2e037 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 ab21711..2e281ca 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 7a02571..2f689e3 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsSecurityTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsSecurityTestCases
index 9ac2684..0997e70 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 9fdb9eb..a4ef5b3 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 fdf2b66..6d838b4 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsShortcutManagerTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsShortcutManagerTestCases
index 64bcbe2..840785b 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 b2e6fe2..b8b8728 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 1f2c6cd..ff92358 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 fddc551..9dca1ac 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 cf86b60..faef930 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 498ab2b..1c9cd67 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 eb375dc..3e4012c 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 54b9847..c37c277 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 d98cf7c..a50ac32 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 7e81242..36255de 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 06b8aa6..2d6a216 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 3f88ec0..0f01256 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 025117c..667c44b 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 205b880..d6995f3 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 7a519c6..2d38e3b 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 8147c62..a078543 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 ab1bf82..cf6d00e 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsToastLegacyTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsToastLegacyTestCases
index f73baf5..f54afb5 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 cb27200..1124989 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 0251b3c..8884d3f 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 ac2bc13..61203d5 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 32e852c..199c05f 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 e2fb6ff..cf3ea1d 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 410216f..d9b6d78 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 577e578..906b59a 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 ddb4eec..88bcf2c 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 ee331e7..6a434f8 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 da523bf..ffee143 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 9eb1f30..0d0f976 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 109517a..23572e2 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 05d8cca..06c35a7 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 7661ab6..128b0bc 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 ac4b0e6..c741fcb 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 e57027f..705d404 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.CtsVoiceInteractionTestCases b/server/site_tests/cheets_CTS_N/control.x86.CtsVoiceInteractionTestCases
index 9e79f4a..9ebf0a0 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 1d966e8..d7bb6e8 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 6ae670c..ded5429 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 72752ca..6c59538 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        '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 2bcf849..1ffb522 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):
diff --git a/server/site_tests/cheets_CTS_N/control.x86.vm-tests-tf b/server/site_tests/cheets_CTS_N/control.x86.vm-tests-tf
index b7e74db..3ce1c42 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_r3 Compatibility Test Suite (CTS), build 3764431,'
+       'Android 7.1_r4 Compatibility Test Suite (CTS), build 3866195,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):