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 b86ec21..45e6de0 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_r5-linux_x86-arm.zip',
-    'x86': _DL_CTS + 'android-cts-7.1_r5-linux_x86-x86.zip',
+    'arm': _DL_CTS + 'android-cts-7.1_r6-linux_x86-arm.zip',
+    'x86': _DL_CTS + 'android-cts-7.1_r6-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 8000252..11760d9 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 f347867..1a1a570 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 ebb8b8e..347e5d4 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 e4af983..2c1b5a7 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 19f5216..1faee79 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 fcd76b6..981acf3 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 e9d6b8d..ed092e2 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 46ec63e..5d9d475 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 a82fb6c..6c89630 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 e341259..73c631e 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 a08211c..0532243 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 bd0456d..ebec27d 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 efec9c2..acefcde 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 226c6f3..eb07927 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 c785c6c..046cec0 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 4911a84..03b554f 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 4a51c7c..e0fc8ba 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 854c49c..1336096 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 dd89309..30b1115 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 c3d223b..fd56669 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 ecfda51..6ccee40 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 465528a..ee077ea 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 dcab904..1951aa1 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 6d6d499..df2020a 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 94be6b5..b1f2fe5 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 44512c2..226f1c0 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 d2afe55..aaa727a 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 24e36ea..8f579f9 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 7d14382..87aa27f 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 5b8b2f9..31e0b9d 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 53fab56..441e369 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 57fb5e9..60ccf05 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 c180158..37fc534 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 6e637fe..65fd043 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 2e6270f..a970641 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 c7fc0f5..f5ae107 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 a59ab9a..9849fe8 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 d23f5af..a05623d 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 d8c578d..5646be3 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 be0f454..0c2a8e0 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 7f4deeb..c846699 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 4ac85d6..28d9057 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 42817bc..beee90c 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 a695427..a1b9c03 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 c774591..c7b2142 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 3da44f2..685145b 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 d957740..00979d8 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 ae98442..72da1e5 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 1b6697f..c090642 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 513fd07..f89896e 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 6473218..2b70521 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 5709064..f9b2e36 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 9972206..8a00ce3 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 89e7bd7..d19a2cf 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 c639ed5..f8a1d23 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 e617045..8637e47 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 6a6967c..31df0a0 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 065687c..3485025 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 0a79063..f9968d6 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 218b809..51b730f 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 ae672b3..22cb4e9 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 48863e6..ca6b87c 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 2844068..af25a34 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 197c285..24d2966 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 0e7852e..a1357bd 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 f948498..3637250 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 a9cc3ad..a785764 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 163a331..417d27e 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 4038fa7..5417cad 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 5a0438b..52cb738 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 366e774..e30e50a 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 556f4f4..dc4b91f 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 3e3895e..3d48990 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 92bed8c..9b8782b 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 b733e98..6320ce5 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 e6ac901..68dc5c7 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 e6e0cfb..76db2fd 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 768ed71..5bd3427 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 1350782..d551ab5 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 b21be7f..744f5bd 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 9a98ac0..0de17da 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 95bed9d..7a09b73 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 861d0d2..b08d113 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 ef143e5..6f6831b 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 c96f1fc..d0d9947 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 935ef8f..539df4b 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 a2895c5..090e34d 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 78b6bfa..e471db0 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 23c3fd4..6ea9c4c 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 8cca4d7..da3f7ed 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 c06a6b6..31b6d18 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 bc3e668..0451714 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 95420e3..1d0e210 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 77d1de8..b0303ba 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 b746ffe..7fd6fb5 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 2106172..f550d3a 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 efac0c4..87d0941 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 4020f3a..f3b1ad6 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 23c8391..70cc3f6 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 a1b9ccb..f3f059f 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 ab188ef..dda7371 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 9628b1a..997c4d5 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 f51cfbb..3df339e 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 f9bd9cf..a43ea3a 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 cf6e92c..3bc9439 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 9089234..ed05f42 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 8ef15fd..0d77ebe 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 d3f5541..cdb3db0 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 6eb69fc..b2c9d90 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 f5d11f6..ea0951a 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 f186c04..948b65f 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 90fa5b7..521801e 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 715422d..eb2b422 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 4274706..5cd4e05 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 5ffc4d1..5a76d61 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 3c5950a..4902c66 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 ed89c80..1d6e4e6 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 f9d791e..bd4a2a1 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 0231b9b..e813dfb 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 4d5350e..9e42de7 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 b825503..bc25d4d 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 565a353..4b19589 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 0f44106..3abbb3d 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 76729e1..1cb6d0a 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 bee1782..d34f479 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 84e6e5b..fd19f32 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 1247aa0..f7910e4 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 eeeaad0..5e0fd56 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 18d09c6..72f4390 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 74f31c6..47bbfc3 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 99d2daf..88224ca 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 c912f64..c067435 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 2458b0d..ef34b34 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 8881ae1..ee63036 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 0f236ed..b45cb97 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 44a2cfa..1e1bbcd 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 fd902f7..14dcca2 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 2ae34ce..370acbd 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 3be1beb..279de78 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 0464592..262f8d4 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 5e283f7..882e1bb 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 524471a..de88df8 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 e4b2bdd..85bd133 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 a98859a..b7e2bc8 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 77d9bd8..081728a 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 63dc4a5..3ce9017 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 e4d6bd1..87a9293 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 4ef175f..14bf009 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 71483c1..64d2af7 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 98a65ff..af6a1b6 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 74afdb2..f1138d8 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 e818515..63c18d9 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 3f8e72d..877af75 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 694f07d..bdd96e6 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 d3f1f4c..41cfe1f 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 0129774..c4f4b9f 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 ce69a6b..7700349 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 7cdbbc3..687e8ab 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 6ffe3ab..b3beb2b 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 ac2c737..428b90f 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 ff9e5b1..ff91bf0 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 69d3564..66384a3 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 8056ba7..0b59653 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 2282edc..312a305 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 9716a3b..9fb4640 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 cfe9b82..4cf4b0d 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 f6ea814..eee23a5 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 ed4864a..56aec91 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 d058526..cb75c33 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 507ed58..22e235c 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 ba0b25a..21b7c20 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 a296572..f749d37 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 e274c45..4071854 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 0ea0f0f..06b7fc7 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 a8a509a..214f1bb 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 90bf000..c123806 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 9c38875..53036e3 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 ae697ec..228fe0c 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 5717397..0f14e21 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 1db0e1b..6773f1f 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 2eedfa7..75925c5 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 219b337..55c3543 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 a511a15..384cc65 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 2e1dcd8..b525c8d 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 ccb061e..a14a2d9 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 fc6df09..333320b 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 b64e219..15dfef2 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 e6375b2..85e5740 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 677e00a..d0c407f 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 391ed49..f4bdd03 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 57c30a9..8c98b44 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 829e893..918cbc4 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 68588d6..d905c87 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 61efef6..8687216 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 b2d8665..8e6b5e7 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 be17563..f5d9b3b 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 e9bad04..9371ecd 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 f6a3ba4..3d3fc66 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 daf1473..b0d7e68 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 c97f1e0..923280b 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 e759f94..dc4ad14 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 eb95a94..ed07dd4 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 05760e6..8fb6efe 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 519f8b3..8604fc2 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 ea2ab9d..6294949 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 0e69470..26e3996 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 d0d4675..c7f4fb9 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 b50e15d..8e9e8ae 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 b541ecd..f66e366 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 6ff2bbb..af6152f 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 d909b68..b971e3b 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 8c9a982..07597ee 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 870c3b8..1071cf1 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 61056b0..0ae472e 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 38bd9a2..a0caa46 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 dd329bb..b78f32e 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 3364dff..9906d65 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 eac0a31..9371bdf 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 a3d8196..841e56b 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 a26de86..44b5a6a 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 cde9451..a711926 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 45a935c..2458eb0 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 0c45f2a..7f2582e 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 d8b99ec..8c8e393 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 029e8f9..bb2dc9b 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 d76bbda..53c0cab 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 059fa82..e64ff19 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 5108cd3..0742a26 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 6467eab..da5c3b7 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 ef7f6c2..6cbac9a 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 2c78579..f77ec35 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 50e1c8e..5283c57 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 e45c288..fbd526c 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 47b873c..5a998da 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 8e6b85c..f32e785 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 6524c55..f0ba296 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 1b6d601..b3388d9 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 70e74eb..b7b7fa5 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 2d4c32e..54ffdf6 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 0d59992..b8b90d8 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 b12a699..838f5f6 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 e367f81..f3bab6e 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 9fecfc1..70c23c6 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 3a99e4b..0319611 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 c3a633e..8fa4dea 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 bba6017..8c35235 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 c86ac97..f56210d 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 39634b9..3493965 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 1b169e5..8560556 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 5fadec2..749f108 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 be9b078..94cf583 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 70976c7..fab2115 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 7880030..41454b6 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 ac09887..da3d7cd 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 d800899..032d331 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 bf66392..e2483e2 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 20ac2df..c8c0a5f 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 4727648..7167c98 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 d983d3a..598efb0 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 9639bb2..177ffd0 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 544fcc4..7ccdfa5 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 f83eebf..377dd7d 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 0c41ae0..10f7703 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 d24679e..6c92dc2 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 492fb8c..0a25a7a 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 499306c..faed527 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 4ce473d..8368094 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 394b703..35faadd 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 ad7005c..5c97c55 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 d04a29c..7cd8150 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 8098b9e..bfedf5e 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 26de391..676c8b0 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 f2c6f55..3bee85f 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 0d463b4..1adc101 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 f9fda69..346630e 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 09e2c50..5d2f0aa 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 a7e3c25..0e6d675 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 4db0bab..e98072e 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 0956c3d..163fb9f 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 6bb92f3..27666ba 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 6f3f895..2da3cd7 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 4af34c9..d20955e 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 2e7f4aa..0336eeb 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 18bf434..2e0e9cf 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 28ac65f..d84ebf9 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 12c7447..2c80f26 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 7b5f35c..fa7f9a9 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 649a9d0..1bf2c85 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 fbcb04e..0e165bb 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 43d692f..7896d80 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 680ba84..0d2d57d 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 3333389..102d39d 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 8ed4c1d..873689d 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 c922cda..099c165 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 88f8c2a..4f1535c 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 c4250df..940b80b 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 2585008..53676ea 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 860f21b..ff4c87e 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 bc54496..32f28df 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 c490c8f..ce5be2f 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 8b5a775..496a8a5 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 c055c17..7db9d8f 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 7af888d..6fe5a0a 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        '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 e802f26..a256ff4 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_r5 Compatibility Test Suite (CTS), build 3943087,'
+       'Android 7.1_r6 Compatibility Test Suite (CTS), build 4009365,'
        'using x86 ABI in the ARC++ container.')
 
 def run_CTS(machine):