cheets_CTS_P: Update to 9.0r11.

BUG=b:68778082
TEST=cheets_CTS_P.9.0_r11.arm.CtsUsbTests

Change-Id: Ie9ae745002320a81ff40a0af445ab519ba706c06
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2109355
Reviewed-by: Kazuhiro Inaba <kinaba@chromium.org>
Commit-Queue: Kazuhiro Inaba <kinaba@chromium.org>
Tested-by: Kazuhiro Inaba <kinaba@chromium.org>
Auto-Submit: Kazuhiro Inaba <kinaba@chromium.org>
(cherry picked from commit 77b9a6fdc74f25222462da62542668e976654baf)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2114855
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAbiOverrideHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAbiOverrideHostTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAbiOverrideHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAbiOverrideHostTestCases
index 40e606b..a2f0e65 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAbiOverrideHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAbiOverrideHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsAbiOverrideHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsAbiOverrideHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsAbiOverrideHostTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsAbiOverrideHostTestCases',
+        tag='9.0_r11.arm.CtsAbiOverrideHostTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsAbiOverrideHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAbiOverrideHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsAbiOverrideHostTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAccelerationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAccelerationTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAccelerationTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAccelerationTestCases
index 31541a2..3e461c6 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAccelerationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAccelerationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsAccelerationTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsAccelerationTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='9.0_r10.arm.CtsAccelerationTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsAccelerationTestCases',
+        tag='9.0_r11.arm.CtsAccelerationTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsAccelerationTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAccelerationTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsAccelerationTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAccessibility b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAccessibility
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAccessibility
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAccessibility
index 067745b..5ece6c7 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAccessibility
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAccessibility
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsAccessibility'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsAccessibility'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsAccessibility',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsAccessibility',
+        tag='9.0_r11.arm.CtsAccessibility',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsAccessibility',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAccessibilityServiceTestCases', '--include-filter', 'CtsAccessibilityTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsAccessibility',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAccountManagerTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAccountManagerTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAccountManagerTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAccountManagerTestCases
index 062b9f4..19f1616 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAccountManagerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAccountManagerTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsAccountManagerTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsAccountManagerTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='9.0_r10.arm.CtsAccountManagerTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsAccountManagerTestCases',
+        tag='9.0_r11.arm.CtsAccountManagerTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsAccountManagerTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAccountManagerTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsAccountManagerTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsActivityManagerDevice b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsActivityManagerDevice
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsActivityManagerDevice
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsActivityManagerDevice
index a27e44c..33faaa5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsActivityManagerDevice
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsActivityManagerDevice
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsActivityManagerDevice'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsActivityManagerDevice'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsActivityManagerDevice',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsActivityManagerDevice',
+        tag='9.0_r11.arm.CtsActivityManagerDevice',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsActivityManagerDevice',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsActivityManagerDeviceSdk25TestCases', '--include-filter', 'CtsActivityManagerDeviceTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsActivityManagerDevice',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=10800)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAdmin b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAdmin
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAdmin
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAdmin
index 61aa3b2..f1adf0f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAdmin
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAdmin
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsAdmin'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsAdmin'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsAdmin',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsAdmin',
+        tag='9.0_r11.arm.CtsAdmin',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsAdmin',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAdminPackageInstallerTestCases', '--include-filter', 'CtsAdminTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsAdmin',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAlarm b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAlarm
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAlarm
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAlarm
index 006c1e1..cc6093a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAlarm
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAlarm
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsAlarm'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsAlarm'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsAlarm',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsAlarm',
+        tag='9.0_r11.arm.CtsAlarm',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsAlarm',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAlarmClockTestCases', '--include-filter', 'CtsAlarmManagerTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsAlarm',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAndroid b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAndroid
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAndroid
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAndroid
index e14a716..12c1b8b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAndroid
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAndroid
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsAndroid'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsAndroid'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsAndroid',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsAndroid',
+        tag='9.0_r11.arm.CtsAndroid',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsAndroid',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAndroidAppTestCases', '--include-filter', 'CtsAndroidTestBase27ApiSignatureTestCases', '--include-filter', 'CtsAndroidTestMockCurrentApiSignatureTestCases', '--include-filter', 'CtsAndroidTestRunnerCurrentApiSignatureTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsAndroid',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=9000)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAnimationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAnimationTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAnimationTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAnimationTestCases
index baee07a..0e662b9 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAnimationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAnimationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsAnimationTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsAnimationTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsAnimationTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsAnimationTestCases',
+        tag='9.0_r11.arm.CtsAnimationTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsAnimationTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAnimationTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsAnimationTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsApacheHttpLegacy b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsApacheHttpLegacy
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsApacheHttpLegacy
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsApacheHttpLegacy
index 3811923..74ab98d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsApacheHttpLegacy
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsApacheHttpLegacy
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsApacheHttpLegacy'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsApacheHttpLegacy'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsApacheHttpLegacy',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsApacheHttpLegacy',
+        tag='9.0_r11.arm.CtsApacheHttpLegacy',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsApacheHttpLegacy',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsApacheHttpLegacy27ApiSignatureTestCases', '--include-filter', 'CtsApacheHttpLegacyCurrentApiSignatureTestCases', '--include-filter', 'CtsApacheHttpLegacyUsesLibraryApiSignatureTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsApacheHttpLegacy',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=7200)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsApp b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsApp
similarity index 90%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsApp
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsApp
index ef737d0..a5ab25c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsApp
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsApp
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsApp'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsApp'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         enable_default_apps=True,
-        tag='9.0_r10.arm.CtsApp',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsApp',
+        tag='9.0_r11.arm.CtsApp',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsApp',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAppComponentFactoryTestCases', '--include-filter', 'CtsAppSecurityHostTestCases', '--include-filter', 'CtsAppTestCases', '--include-filter', 'CtsAppUsageHostTestCases', '--include-filter', 'CtsAppWidgetTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsApp',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         login_precondition_commands=['lsblk -do NAME,RM | sed -n s/1$//p | xargs -n1 eject'],
         timeout=16200)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAslrMallocTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAslrMallocTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAslrMallocTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAslrMallocTestCases
index 6f0c9cb..130aab7 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAslrMallocTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAslrMallocTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsAslrMallocTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsAslrMallocTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsAslrMallocTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsAslrMallocTestCases',
+        tag='9.0_r11.arm.CtsAslrMallocTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsAslrMallocTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAslrMallocTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsAslrMallocTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAssistTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAssistTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAssistTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAssistTestCases
index 3619437..fd5dff2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAssistTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAssistTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsAssistTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsAssistTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsAssistTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsAssistTestCases',
+        tag='9.0_r11.arm.CtsAssistTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsAssistTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAssistTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsAssistTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAtraceHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAtraceHostTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAtraceHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAtraceHostTestCases
index 1ca7eda..165ed9c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAtraceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAtraceHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsAtraceHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsAtraceHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsAtraceHostTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsAtraceHostTestCases',
+        tag='9.0_r11.arm.CtsAtraceHostTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsAtraceHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAtraceHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsAtraceHostTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAutoFillServiceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAutoFillServiceTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAutoFillServiceTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAutoFillServiceTestCases
index f6880ad..b77d14d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAutoFillServiceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAutoFillServiceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsAutoFillServiceTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsAutoFillServiceTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsAutoFillServiceTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsAutoFillServiceTestCases',
+        tag='9.0_r11.arm.CtsAutoFillServiceTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsAutoFillServiceTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAutoFillServiceTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsAutoFillServiceTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=9000)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsBackgroundRestrictionsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsBackgroundRestrictionsTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsBackgroundRestrictionsTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsBackgroundRestrictionsTestCases
index 0f0879a..593a722 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsBackgroundRestrictionsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsBackgroundRestrictionsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsBackgroundRestrictionsTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsBackgroundRestrictionsTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsBackgroundRestrictionsTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsBackgroundRestrictionsTestCases',
+        tag='9.0_r11.arm.CtsBackgroundRestrictionsTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsBackgroundRestrictionsTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsBackgroundRestrictionsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsBackgroundRestrictionsTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsBackup b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsBackup
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsBackup
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsBackup
index 2a23f8b..3a562f0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsBackup
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsBackup
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsBackup'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsBackup'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsBackup',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsBackup',
+        tag='9.0_r11.arm.CtsBackup',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsBackup',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsBackupHostTestCases', '--include-filter', 'CtsBackupTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsBackup',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsBatterySavingTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsBatterySavingTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsBatterySavingTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsBatterySavingTestCases
index 484fbc3..61b0df0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsBatterySavingTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsBatterySavingTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsBatterySavingTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsBatterySavingTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsBatterySavingTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsBatterySavingTestCases',
+        tag='9.0_r11.arm.CtsBatterySavingTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsBatterySavingTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsBatterySavingTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsBatterySavingTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsBionicTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsBionicTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsBionicTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsBionicTestCases
index a787b41..71492bd 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsBionicTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsBionicTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsBionicTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsBionicTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsBionicTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsBionicTestCases',
+        tag='9.0_r11.arm.CtsBionicTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsBionicTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsBionicTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsBionicTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsBluetoothTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsBluetoothTestCases
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsBluetoothTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsBluetoothTestCases
index 33b9a74..b9cfe11 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsBluetoothTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsBluetoothTestCases
@@ -7,7 +7,7 @@
 from autotest_lib.server import utils
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsBluetoothTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsBluetoothTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:arc-cts-unibuild-hw'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -33,14 +33,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsBluetoothTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsBluetoothTestCases',
+        tag='9.0_r11.arm.CtsBluetoothTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsBluetoothTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsBluetoothTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsBluetoothTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         hard_reboot_on_failure=True,
         timeout=3600)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsBootStatsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsBootStatsTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsBootStatsTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsBootStatsTestCases
index cda930e..e0a2350 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsBootStatsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsBootStatsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsBootStatsTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsBootStatsTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsBootStatsTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsBootStatsTestCases',
+        tag='9.0_r11.arm.CtsBootStatsTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsBootStatsTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsBootStatsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsBootStatsTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCalendarcommon2TestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCalendarcommon2TestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCalendarcommon2TestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCalendarcommon2TestCases
index 279225d..a739de3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCalendarcommon2TestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCalendarcommon2TestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsCalendarcommon2TestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsCalendarcommon2TestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsCalendarcommon2TestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsCalendarcommon2TestCases',
+        tag='9.0_r11.arm.CtsCalendarcommon2TestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsCalendarcommon2TestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCalendarcommon2TestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsCalendarcommon2TestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCamera b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCamera
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCamera
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCamera
index 7116514..403ce4f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCamera
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCamera
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsCamera'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsCamera'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:arc-cts-unibuild-hw'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsCamera',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsCamera',
+        tag='9.0_r11.arm.CtsCamera',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsCamera',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraApi25TestCases', '--include-filter', 'CtsCameraTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsCamera',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCameraTestCases.camerabox.back b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCameraTestCases.camerabox.back
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCameraTestCases.camerabox.back
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCameraTestCases.camerabox.back
index d23f9b5..655e15a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCameraTestCases.camerabox.back
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCameraTestCases.camerabox.back
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsCameraTestCases.camerabox.back'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsCameraTestCases.camerabox.back'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:arc-cts-unibuild-hw'
 DEPENDENCIES = 'arc, camerabox'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         cmdline_args=args,
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsCameraTestCases.camerabox.back',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsCameraTestCases.camerabox.back',
+        tag='9.0_r11.arm.CtsCameraTestCases.camerabox.back',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsCameraTestCases.camerabox.back',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCameraTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsCameraTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCameraTestCases.camerabox.front b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCameraTestCases.camerabox.front
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCameraTestCases.camerabox.front
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCameraTestCases.camerabox.front
index ac11c83..687da46 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCameraTestCases.camerabox.front
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCameraTestCases.camerabox.front
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsCameraTestCases.camerabox.front'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsCameraTestCases.camerabox.front'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:arc-cts-unibuild-hw'
 DEPENDENCIES = 'arc, camerabox'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         cmdline_args=args,
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsCameraTestCases.camerabox.front',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsCameraTestCases.camerabox.front',
+        tag='9.0_r11.arm.CtsCameraTestCases.camerabox.front',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsCameraTestCases.camerabox.front',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCameraTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsCameraTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCarTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCarTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCarTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCarTestCases
index fde977e..9ff94e3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCarTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCarTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsCarTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsCarTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsCarTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsCarTestCases',
+        tag='9.0_r11.arm.CtsCarTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsCarTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCarTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsCarTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCarrierApiTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCarrierApiTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCarrierApiTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCarrierApiTestCases
index 21d007c..842a9e0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCarrierApiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCarrierApiTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsCarrierApiTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsCarrierApiTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsCarrierApiTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsCarrierApiTestCases',
+        tag='9.0_r11.arm.CtsCarrierApiTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsCarrierApiTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCarrierApiTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsCarrierApiTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsColorModeTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsColorModeTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsColorModeTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsColorModeTestCases
index 87e3452..59cab39 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsColorModeTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsColorModeTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsColorModeTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsColorModeTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsColorModeTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsColorModeTestCases',
+        tag='9.0_r11.arm.CtsColorModeTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsColorModeTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsColorModeTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsColorModeTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCompilationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCompilationTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCompilationTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCompilationTestCases
index 9b05313..f987fe9 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCompilationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCompilationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsCompilationTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsCompilationTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsCompilationTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsCompilationTestCases',
+        tag='9.0_r11.arm.CtsCompilationTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsCompilationTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCompilationTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsCompilationTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsContactsProviderWipe b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsContactsProviderWipe
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsContactsProviderWipe
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsContactsProviderWipe
index 2215217..3553d49 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsContactsProviderWipe
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsContactsProviderWipe
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsContactsProviderWipe'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsContactsProviderWipe'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsContactsProviderWipe',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsContactsProviderWipe',
+        tag='9.0_r11.arm.CtsContactsProviderWipe',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsContactsProviderWipe',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsContactsProviderWipe', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsContactsProviderWipe',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsContentTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsContentTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsContentTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsContentTestCases
index 4114a96..d64fc6a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsContentTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsContentTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsContentTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsContentTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         enable_default_apps=True,
-        tag='9.0_r10.arm.CtsContentTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsContentTestCases',
+        tag='9.0_r11.arm.CtsContentTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsContentTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsContentTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsContentTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCppToolsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCppToolsTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCppToolsTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCppToolsTestCases
index 5bbdee5..993daee 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCppToolsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCppToolsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsCppToolsTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsCppToolsTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsCppToolsTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsCppToolsTestCases',
+        tag='9.0_r11.arm.CtsCppToolsTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsCppToolsTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCppToolsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsCppToolsTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCurrentApiSignatureTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCurrentApiSignatureTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCurrentApiSignatureTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCurrentApiSignatureTestCases
index d187489..621b28b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCurrentApiSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCurrentApiSignatureTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsCurrentApiSignatureTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsCurrentApiSignatureTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsCurrentApiSignatureTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsCurrentApiSignatureTestCases',
+        tag='9.0_r11.arm.CtsCurrentApiSignatureTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsCurrentApiSignatureTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCurrentApiSignatureTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsCurrentApiSignatureTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDatabaseTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDatabaseTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDatabaseTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDatabaseTestCases
index 4093a77..d007699 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDatabaseTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDatabaseTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsDatabaseTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsDatabaseTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsDatabaseTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsDatabaseTestCases',
+        tag='9.0_r11.arm.CtsDatabaseTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsDatabaseTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDatabaseTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDatabaseTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDebugTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDebugTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDebugTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDebugTestCases
index fa2451a..ef8f19b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDebugTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDebugTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsDebugTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsDebugTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsDebugTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsDebugTestCases',
+        tag='9.0_r11.arm.CtsDebugTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsDebugTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDebugTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDebugTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDeqpTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDeqpTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDeqpTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDeqpTestCases
index 6a10884..e4986d3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDeqpTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDeqpTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsDeqpTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsDeqpTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-deqp, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=15,
-        tag='9.0_r10.arm.CtsDeqpTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsDeqpTestCases',
+        tag='9.0_r11.arm.CtsDeqpTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsDeqpTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDeqpTestCases', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDeqpTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=72000)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDeqpTestCases.dEQP-EGL b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDeqpTestCases.dEQP-EGL
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDeqpTestCases.dEQP-EGL
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDeqpTestCases.dEQP-EGL
index 7c07d95..e0a11e1 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDeqpTestCases.dEQP-EGL
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDeqpTestCases.dEQP-EGL
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsDeqpTestCases.dEQP-EGL'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsDeqpTestCases.dEQP-EGL'
 ATTRIBUTES = 'suite:arc-cts-deqp, suite:graphics_per-day'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 0
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsDeqpTestCases.dEQP-EGL',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsDeqpTestCases.dEQP-EGL',
+        tag='9.0_r11.arm.CtsDeqpTestCases.dEQP-EGL',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsDeqpTestCases.dEQP-EGL',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-EGL.*', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDeqpTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=7200)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDeqpTestCases.dEQP-GLES2 b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDeqpTestCases.dEQP-GLES2
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDeqpTestCases.dEQP-GLES2
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDeqpTestCases.dEQP-GLES2
index 3fc1a9c..a649239 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDeqpTestCases.dEQP-GLES2
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDeqpTestCases.dEQP-GLES2
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsDeqpTestCases.dEQP-GLES2'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsDeqpTestCases.dEQP-GLES2'
 ATTRIBUTES = 'suite:arc-cts-deqp, suite:graphics_per-day'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 0
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsDeqpTestCases.dEQP-GLES2',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsDeqpTestCases.dEQP-GLES2',
+        tag='9.0_r11.arm.CtsDeqpTestCases.dEQP-GLES2',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsDeqpTestCases.dEQP-GLES2',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES2.*', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDeqpTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=7200)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDeqpTestCases.dEQP-GLES3 b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDeqpTestCases.dEQP-GLES3
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDeqpTestCases.dEQP-GLES3
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDeqpTestCases.dEQP-GLES3
index 988e714..39271c7 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDeqpTestCases.dEQP-GLES3
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDeqpTestCases.dEQP-GLES3
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsDeqpTestCases.dEQP-GLES3'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsDeqpTestCases.dEQP-GLES3'
 ATTRIBUTES = 'suite:arc-cts-deqp, suite:graphics_per-day'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 0
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsDeqpTestCases.dEQP-GLES3',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsDeqpTestCases.dEQP-GLES3',
+        tag='9.0_r11.arm.CtsDeqpTestCases.dEQP-GLES3',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsDeqpTestCases.dEQP-GLES3',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES3.*', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDeqpTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=21600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDeqpTestCases.dEQP-GLES31 b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDeqpTestCases.dEQP-GLES31
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDeqpTestCases.dEQP-GLES31
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDeqpTestCases.dEQP-GLES31
index e97ef90..33fb4a5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDeqpTestCases.dEQP-GLES31
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDeqpTestCases.dEQP-GLES31
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsDeqpTestCases.dEQP-GLES31'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsDeqpTestCases.dEQP-GLES31'
 ATTRIBUTES = 'suite:arc-cts-deqp, suite:graphics_per-day'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 0
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsDeqpTestCases.dEQP-GLES31',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsDeqpTestCases.dEQP-GLES31',
+        tag='9.0_r11.arm.CtsDeqpTestCases.dEQP-GLES31',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsDeqpTestCases.dEQP-GLES31',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES31.*', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDeqpTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=21600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDeqpTestCases.dEQP-VK b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDeqpTestCases.dEQP-VK
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDeqpTestCases.dEQP-VK
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDeqpTestCases.dEQP-VK
index 3ccb0c1..aa0d345 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDeqpTestCases.dEQP-VK
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDeqpTestCases.dEQP-VK
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsDeqpTestCases.dEQP-VK'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsDeqpTestCases.dEQP-VK'
 ATTRIBUTES = 'suite:arc-cts-deqp, suite:graphics_per-day'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 0
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsDeqpTestCases.dEQP-VK',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsDeqpTestCases.dEQP-VK',
+        tag='9.0_r11.arm.CtsDeqpTestCases.dEQP-VK',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsDeqpTestCases.dEQP-VK',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-VK.*', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDeqpTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=54000)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDevice b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDevice
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDevice
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDevice
index 0c2b6d3..ee9fa1c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDevice
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDevice
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsDevice'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsDevice'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsDevice',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsDevice',
+        tag='9.0_r11.arm.CtsDevice',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsDevice',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeviceIdleHostTestCases', '--include-filter', 'CtsDevicePolicyManagerTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDevice',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDexMetadataHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDexMetadataHostTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDexMetadataHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDexMetadataHostTestCases
index 568f1f0..3ee21e5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDexMetadataHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDexMetadataHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsDexMetadataHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsDexMetadataHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsDexMetadataHostTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsDexMetadataHostTestCases',
+        tag='9.0_r11.arm.CtsDexMetadataHostTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsDexMetadataHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDexMetadataHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDexMetadataHostTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDisplayTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDisplayTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDisplayTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDisplayTestCases
index 8f84282..0e8d8e3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDisplayTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDisplayTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsDisplayTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsDisplayTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsDisplayTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsDisplayTestCases',
+        tag='9.0_r11.arm.CtsDisplayTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsDisplayTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDisplayTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDisplayTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDpi b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDpi
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDpi
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDpi
index 5055085..22ca2a3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDpi
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDpi
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsDpi'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsDpi'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsDpi',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsDpi',
+        tag='9.0_r11.arm.CtsDpi',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsDpi',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDpiTestCases', '--include-filter', 'CtsDpiTestCases2', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDpi',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDreamsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDreamsTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDreamsTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDreamsTestCases
index e94189c..e0f535b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDreamsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDreamsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsDreamsTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsDreamsTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsDreamsTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsDreamsTestCases',
+        tag='9.0_r11.arm.CtsDreamsTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsDreamsTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDreamsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDreamsTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDrmTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDrmTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDrmTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDrmTestCases
index edbfeba..2125c21 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDrmTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDrmTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsDrmTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsDrmTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsDrmTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsDrmTestCases',
+        tag='9.0_r11.arm.CtsDrmTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsDrmTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDrmTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDrmTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDumpsysHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDumpsysHostTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDumpsysHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDumpsysHostTestCases
index 94c6289..8dca988 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDumpsysHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDumpsysHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsDumpsysHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsDumpsysHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsDumpsysHostTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsDumpsysHostTestCases',
+        tag='9.0_r11.arm.CtsDumpsysHostTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsDumpsysHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDumpsysHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDumpsysHostTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDynamicLinkerTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDynamicLinkerTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDynamicLinkerTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDynamicLinkerTestCases
index f17f748..80bdd9d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDynamicLinkerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsDynamicLinkerTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsDynamicLinkerTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsDynamicLinkerTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsDynamicLinkerTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsDynamicLinkerTestCases',
+        tag='9.0_r11.arm.CtsDynamicLinkerTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsDynamicLinkerTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDynamicLinkerTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDynamicLinkerTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsEdiHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsEdiHostTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsEdiHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsEdiHostTestCases
index b5165df..ff2568c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsEdiHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsEdiHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsEdiHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsEdiHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsEdiHostTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsEdiHostTestCases',
+        tag='9.0_r11.arm.CtsEdiHostTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsEdiHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsEdiHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsEdiHostTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsEffectTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsEffectTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsEffectTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsEffectTestCases
index 9cb2c6c..13b0cde 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsEffectTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsEffectTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsEffectTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsEffectTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsEffectTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsEffectTestCases',
+        tag='9.0_r11.arm.CtsEffectTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsEffectTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsEffectTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsEffectTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsExternalS b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsExternalS
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsExternalS
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsExternalS
index c45442c..765c55f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsExternalS
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsExternalS
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsExternalS'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsExternalS'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsExternalS',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsExternalS',
+        tag='9.0_r11.arm.CtsExternalS',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsExternalS',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsExternalServiceTestCases', '--include-filter', 'CtsExternalSourcesTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsExternalS',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsFileSystemTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsFileSystemTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsFileSystemTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsFileSystemTestCases
index f53fc25..2f84092 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsFileSystemTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsFileSystemTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsFileSystemTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsFileSystemTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsFileSystemTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsFileSystemTestCases',
+        tag='9.0_r11.arm.CtsFileSystemTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsFileSystemTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsFileSystemTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsFileSystemTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=10800)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsFragment b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsFragment
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsFragment
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsFragment
index ca34a37..3b5d766 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsFragment
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsFragment
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsFragment'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsFragment'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsFragment',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsFragment',
+        tag='9.0_r11.arm.CtsFragment',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsFragment',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsFragmentTestCases', '--include-filter', 'CtsFragmentTestCasesSdk26', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsFragment',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsGestureTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsGestureTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsGestureTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsGestureTestCases
index 5e0a2dd..dfc2037 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsGestureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsGestureTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsGestureTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsGestureTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsGestureTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsGestureTestCases',
+        tag='9.0_r11.arm.CtsGestureTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsGestureTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsGestureTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsGestureTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsGpuToolsHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsGpuToolsHostTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsGpuToolsHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsGpuToolsHostTestCases
index f53f38d..34b3786 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsGpuToolsHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsGpuToolsHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsGpuToolsHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsGpuToolsHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsGpuToolsHostTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsGpuToolsHostTestCases',
+        tag='9.0_r11.arm.CtsGpuToolsHostTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsGpuToolsHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsGpuToolsHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsGpuToolsHostTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsGraphicsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsGraphicsTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsGraphicsTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsGraphicsTestCases
index 5048035..ad9868e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsGraphicsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsGraphicsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsGraphicsTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsGraphicsTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='9.0_r10.arm.CtsGraphicsTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsGraphicsTestCases',
+        tag='9.0_r11.arm.CtsGraphicsTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsGraphicsTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsGraphicsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsGraphicsTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsHardwareTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsHardwareTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsHardwareTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsHardwareTestCases
index 4285a02..4df07ad 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsHardwareTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsHardwareTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsHardwareTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsHardwareTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsHardwareTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsHardwareTestCases',
+        tag='9.0_r11.arm.CtsHardwareTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsHardwareTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsHardwareTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsHardwareTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsHarmfulAppWarningHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsHarmfulAppWarningHostTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsHarmfulAppWarningHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsHarmfulAppWarningHostTestCases
index 29ef628..38059e5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsHarmfulAppWarningHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsHarmfulAppWarningHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsHarmfulAppWarningHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsHarmfulAppWarningHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsHarmfulAppWarningHostTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsHarmfulAppWarningHostTestCases',
+        tag='9.0_r11.arm.CtsHarmfulAppWarningHostTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsHarmfulAppWarningHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsHarmfulAppWarningHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsHarmfulAppWarningHostTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsHiddenApi b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsHiddenApi
similarity index 90%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsHiddenApi
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsHiddenApi
index ea4405b..e39a49b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsHiddenApi
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsHiddenApi
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsHiddenApi'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsHiddenApi'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsHiddenApi',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsHiddenApi',
+        tag='9.0_r11.arm.CtsHiddenApi',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsHiddenApi',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHiddenApiBlacklistApi27TestCases', '--include-filter', 'CtsHiddenApiBlacklistCurrentApiTestCases', '--include-filter', 'CtsHiddenApiBlacklistDebugClassTestCases', '--include-filter', 'CtsHiddenApiKillswitchDebugClassTestCases', '--include-filter', 'CtsHiddenApiKillswitchWhitelistTestCases', '--include-filter', 'CtsHiddenApiKillswitchWildcardTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsHiddenApi',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=12600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsHostTzDataTests b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsHostTzDataTests
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsHostTzDataTests
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsHostTzDataTests
index a9f072b..a5d67ca 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsHostTzDataTests
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsHostTzDataTests
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsHostTzDataTests'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsHostTzDataTests'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsHostTzDataTests',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsHostTzDataTests',
+        tag='9.0_r11.arm.CtsHostTzDataTests',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsHostTzDataTests',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsHostTzDataTests', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsHostTzDataTests',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsHostside b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsHostside
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsHostside
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsHostside
index a7cb9f2..5b38046 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsHostside
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsHostside
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsHostside'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsHostside'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsHostside',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsHostside',
+        tag='9.0_r11.arm.CtsHostside',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsHostside',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHostsideNetworkTests', '--include-filter', 'CtsHostsideNumberBlockingTestCases', '--include-filter', 'CtsHostsideTvTests', '--include-filter', 'CtsHostsideWebViewTests', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsHostside',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=9000)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsIcuTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsIcuTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsIcuTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsIcuTestCases
index 9a31e3f..f07b66d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsIcuTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsIcuTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsIcuTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsIcuTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsIcuTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsIcuTestCases',
+        tag='9.0_r11.arm.CtsIcuTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsIcuTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsIcuTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsIcuTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=7200)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsIncidentHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsIncidentHostTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsIncidentHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsIncidentHostTestCases
index c963dff..1a7ea5b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsIncidentHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsIncidentHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsIncidentHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsIncidentHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=30,
-        tag='9.0_r10.arm.CtsIncidentHostTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsIncidentHostTestCases',
+        tag='9.0_r11.arm.CtsIncidentHostTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsIncidentHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsIncidentHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsIncidentHostTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsInlineMockingTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsInlineMockingTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsInlineMockingTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsInlineMockingTestCases
index 336cdc0..6068347 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsInlineMockingTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsInlineMockingTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsInlineMockingTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsInlineMockingTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsInlineMockingTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsInlineMockingTestCases',
+        tag='9.0_r11.arm.CtsInlineMockingTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsInlineMockingTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsInlineMockingTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsInlineMockingTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsInputMethod b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsInputMethod
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsInputMethod
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsInputMethod
index c13550b..c2099f7 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsInputMethod
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsInputMethod
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsInputMethod'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsInputMethod'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsInputMethod',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsInputMethod',
+        tag='9.0_r11.arm.CtsInputMethod',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsInputMethod',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsInputMethodServiceHostTestCases', '--include-filter', 'CtsInputMethodTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsInputMethod',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsIntentSignatureTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsIntentSignatureTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsIntentSignatureTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsIntentSignatureTestCases
index ef9e969..694badf 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsIntentSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsIntentSignatureTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsIntentSignatureTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsIntentSignatureTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsIntentSignatureTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsIntentSignatureTestCases',
+        tag='9.0_r11.arm.CtsIntentSignatureTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsIntentSignatureTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsIntentSignatureTestCases', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='CtsIntentSignatureTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsJankDeviceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsJankDeviceTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsJankDeviceTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsJankDeviceTestCases
index e91862b..fe365fe 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsJankDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsJankDeviceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsJankDeviceTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsJankDeviceTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='9.0_r10.arm.CtsJankDeviceTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsJankDeviceTestCases',
+        tag='9.0_r11.arm.CtsJankDeviceTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsJankDeviceTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsJankDeviceTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsJankDeviceTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsJdwp b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsJdwp
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsJdwp
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsJdwp
index c381bd3..10de9ab 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsJdwp
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsJdwp
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsJdwp'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsJdwp'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsJdwp',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsJdwp',
+        tag='9.0_r11.arm.CtsJdwp',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsJdwp',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJdwpSecurityHostTestCases', '--include-filter', 'CtsJdwpTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsJdwp',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsJniTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsJniTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsJniTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsJniTestCases
index 3761ca2..fc80ce7 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsJniTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsJniTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsJniTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsJniTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsJniTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsJniTestCases',
+        tag='9.0_r11.arm.CtsJniTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsJniTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsJniTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsJniTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsJobScheduler b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsJobScheduler
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsJobScheduler
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsJobScheduler
index f85c721..9c43e13 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsJobScheduler
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsJobScheduler
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsJobScheduler'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsJobScheduler'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsJobScheduler',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsJobScheduler',
+        tag='9.0_r11.arm.CtsJobScheduler',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsJobScheduler',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJobSchedulerSharedUidTestCases', '--include-filter', 'CtsJobSchedulerTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsJobScheduler',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         login_precondition_commands=['lsblk -do NAME,RM | sed -n s/1$//p | xargs -n1 eject'],
         timeout=5400)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsJvmti b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsJvmti
similarity index 97%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsJvmti
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsJvmti
index cb5f641..d581bee 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsJvmti
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsJvmti
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsJvmti'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsJvmti'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsJvmti',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsJvmti',
+        tag='9.0_r11.arm.CtsJvmti',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsJvmti',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiAttachingHostTestCases', '--include-filter', 'CtsJvmtiAttachingTestCases', '--include-filter', 'CtsJvmtiRedefineClassesHostTestCases', '--include-filter', 'CtsJvmtiRunTest1900HostTestCases', '--include-filter', 'CtsJvmtiRunTest1901HostTestCases', '--include-filter', 'CtsJvmtiRunTest1902HostTestCases', '--include-filter', 'CtsJvmtiRunTest1903HostTestCases', '--include-filter', 'CtsJvmtiRunTest1904HostTestCases', '--include-filter', 'CtsJvmtiRunTest1906HostTestCases', '--include-filter', 'CtsJvmtiRunTest1907HostTestCases', '--include-filter', 'CtsJvmtiRunTest1908HostTestCases', '--include-filter', 'CtsJvmtiRunTest1909HostTestCases', '--include-filter', 'CtsJvmtiRunTest1910HostTestCases', '--include-filter', 'CtsJvmtiRunTest1911HostTestCases', '--include-filter', 'CtsJvmtiRunTest1912HostTestCases', '--include-filter', 'CtsJvmtiRunTest1913HostTestCases', '--include-filter', 'CtsJvmtiRunTest1914HostTestCases', '--include-filter', 'CtsJvmtiRunTest1915HostTestCases', '--include-filter', 'CtsJvmtiRunTest1916HostTestCases', '--include-filter', 'CtsJvmtiRunTest1917HostTestCases', '--include-filter', 'CtsJvmtiRunTest1920HostTestCases', '--include-filter', 'CtsJvmtiRunTest1921HostTestCases', '--include-filter', 'CtsJvmtiRunTest1922HostTestCases', '--include-filter', 'CtsJvmtiRunTest1923HostTestCases', '--include-filter', 'CtsJvmtiRunTest1924HostTestCases', '--include-filter', 'CtsJvmtiRunTest1925HostTestCases', '--include-filter', 'CtsJvmtiRunTest1926HostTestCases', '--include-filter', 'CtsJvmtiRunTest1927HostTestCases', '--include-filter', 'CtsJvmtiRunTest1928HostTestCases', '--include-filter', 'CtsJvmtiRunTest1930HostTestCases', '--include-filter', 'CtsJvmtiRunTest1931HostTestCases', '--include-filter', 'CtsJvmtiRunTest1932HostTestCases', '--include-filter', 'CtsJvmtiRunTest1933HostTestCases', '--include-filter', 'CtsJvmtiRunTest1934HostTestCases', '--include-filter', 'CtsJvmtiRunTest1936HostTestCases', '--include-filter', 'CtsJvmtiRunTest1937HostTestCases', '--include-filter', 'CtsJvmtiRunTest1939HostTestCases', '--include-filter', 'CtsJvmtiRunTest1941HostTestCases', '--include-filter', 'CtsJvmtiRunTest1942HostTestCases', '--include-filter', 'CtsJvmtiRunTest1943HostTestCases', '--include-filter', 'CtsJvmtiRunTest902HostTestCases', '--include-filter', 'CtsJvmtiRunTest903HostTestCases', '--include-filter', 'CtsJvmtiRunTest904HostTestCases', '--include-filter', 'CtsJvmtiRunTest905HostTestCases', '--include-filter', 'CtsJvmtiRunTest906HostTestCases', '--include-filter', 'CtsJvmtiRunTest907HostTestCases', '--include-filter', 'CtsJvmtiRunTest908HostTestCases', '--include-filter', 'CtsJvmtiRunTest910HostTestCases', '--include-filter', 'CtsJvmtiRunTest911HostTestCases', '--include-filter', 'CtsJvmtiRunTest912HostTestCases', '--include-filter', 'CtsJvmtiRunTest913HostTestCases', '--include-filter', 'CtsJvmtiRunTest914HostTestCases', '--include-filter', 'CtsJvmtiRunTest915HostTestCases', '--include-filter', 'CtsJvmtiRunTest917HostTestCases', '--include-filter', 'CtsJvmtiRunTest918HostTestCases', '--include-filter', 'CtsJvmtiRunTest919HostTestCases', '--include-filter', 'CtsJvmtiRunTest920HostTestCases', '--include-filter', 'CtsJvmtiRunTest922HostTestCases', '--include-filter', 'CtsJvmtiRunTest923HostTestCases', '--include-filter', 'CtsJvmtiRunTest924HostTestCases', '--include-filter', 'CtsJvmtiRunTest926HostTestCases', '--include-filter', 'CtsJvmtiRunTest927HostTestCases', '--include-filter', 'CtsJvmtiRunTest928HostTestCases', '--include-filter', 'CtsJvmtiRunTest930HostTestCases', '--include-filter', 'CtsJvmtiRunTest931HostTestCases', '--include-filter', 'CtsJvmtiRunTest932HostTestCases', '--include-filter', 'CtsJvmtiRunTest940HostTestCases', '--include-filter', 'CtsJvmtiRunTest942HostTestCases', '--include-filter', 'CtsJvmtiRunTest944HostTestCases', '--include-filter', 'CtsJvmtiRunTest945HostTestCases', '--include-filter', 'CtsJvmtiRunTest947HostTestCases', '--include-filter', 'CtsJvmtiRunTest951HostTestCases', '--include-filter', 'CtsJvmtiRunTest982HostTestCases', '--include-filter', 'CtsJvmtiRunTest983HostTestCases', '--include-filter', 'CtsJvmtiRunTest984HostTestCases', '--include-filter', 'CtsJvmtiRunTest985HostTestCases', '--include-filter', 'CtsJvmtiRunTest986HostTestCases', '--include-filter', 'CtsJvmtiRunTest988HostTestCases', '--include-filter', 'CtsJvmtiRunTest989HostTestCases', '--include-filter', 'CtsJvmtiRunTest990HostTestCases', '--include-filter', 'CtsJvmtiRunTest991HostTestCases', '--include-filter', 'CtsJvmtiRunTest992HostTestCases', '--include-filter', 'CtsJvmtiRunTest993HostTestCases', '--include-filter', 'CtsJvmtiRunTest994HostTestCases', '--include-filter', 'CtsJvmtiRunTest995HostTestCases', '--include-filter', 'CtsJvmtiRunTest996HostTestCases', '--include-filter', 'CtsJvmtiRunTest997HostTestCases', '--include-filter', 'CtsJvmtiTaggingHostTestCases', '--include-filter', 'CtsJvmtiTrackingHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsJvmti',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=26700)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsKernelConfigTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsKernelConfigTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsKernelConfigTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsKernelConfigTestCases
index 4dea900..3ffbf2d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsKernelConfigTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsKernelConfigTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsKernelConfigTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsKernelConfigTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsKernelConfigTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsKernelConfigTestCases',
+        tag='9.0_r11.arm.CtsKernelConfigTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsKernelConfigTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsKernelConfigTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsKernelConfigTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsKeystoreTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsKeystoreTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsKeystoreTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsKeystoreTestCases
index c6bb698..7a1edfe 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsKeystoreTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsKeystoreTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsKeystoreTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsKeystoreTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsKeystoreTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsKeystoreTestCases',
+        tag='9.0_r11.arm.CtsKeystoreTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsKeystoreTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsKeystoreTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsKeystoreTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsLeanbackJankTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsLeanbackJankTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsLeanbackJankTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsLeanbackJankTestCases
index 59b0eb4..924e0ed 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsLeanbackJankTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsLeanbackJankTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsLeanbackJankTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsLeanbackJankTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsLeanbackJankTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsLeanbackJankTestCases',
+        tag='9.0_r11.arm.CtsLeanbackJankTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsLeanbackJankTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsLeanbackJankTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsLeanbackJankTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsLegacyNotificationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsLegacyNotificationTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsLegacyNotificationTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsLegacyNotificationTestCases
index 623b9db..f931b96 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsLegacyNotificationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsLegacyNotificationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsLegacyNotificationTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsLegacyNotificationTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsLegacyNotificationTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsLegacyNotificationTestCases',
+        tag='9.0_r11.arm.CtsLegacyNotificationTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsLegacyNotificationTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsLegacyNotificationTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsLegacyNotificationTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsLibcore b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsLibcore
similarity index 90%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsLibcore
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsLibcore
index eacc7d8..5f56741 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsLibcore
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsLibcore
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsLibcore'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsLibcore'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsLibcore',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsLibcore',
+        tag='9.0_r11.arm.CtsLibcore',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsLibcore',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLibcoreFileIOTestCases', '--include-filter', 'CtsLibcoreJsr166TestCases', '--include-filter', 'CtsLibcoreLegacy22TestCases', '--include-filter', 'CtsLibcoreOjTestCases', '--include-filter', 'CtsLibcoreOkHttpTestCases', '--include-filter', 'CtsLibcoreTestCases', '--include-filter', 'CtsLibcoreWycheproofBCTestCases', '--include-filter', 'CtsLibcoreWycheproofConscryptTestCases', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsLibcore',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=21600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsLiblogTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsLiblogTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsLiblogTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsLiblogTestCases
index e14cb7b..0213afb 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsLiblogTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsLiblogTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsLiblogTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsLiblogTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsLiblogTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsLiblogTestCases',
+        tag='9.0_r11.arm.CtsLiblogTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsLiblogTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsLiblogTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsLiblogTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsLocation b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsLocation
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsLocation
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsLocation
index 0d567d8..e6b4aea 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsLocation
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsLocation
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsLocation'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsLocation'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsLocation',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsLocation',
+        tag='9.0_r11.arm.CtsLocation',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsLocation',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLocation2TestCases', '--include-filter', 'CtsLocationTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsLocation',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsLogdTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsLogdTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsLogdTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsLogdTestCases
index 89ac693..eac774b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsLogdTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsLogdTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsLogdTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsLogdTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsLogdTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsLogdTestCases',
+        tag='9.0_r11.arm.CtsLogdTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsLogdTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsLogdTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsLogdTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsMediaBitstreamsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsMediaBitstreamsTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsMediaBitstreamsTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsMediaBitstreamsTestCases
index ed46c63..6c2301b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsMediaBitstreamsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsMediaBitstreamsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsMediaBitstreamsTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsMediaBitstreamsTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=True,
-        tag='9.0_r10.arm.CtsMediaBitstreamsTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsMediaBitstreamsTestCases',
+        tag='9.0_r11.arm.CtsMediaBitstreamsTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsMediaBitstreamsTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaBitstreamsTestCases', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='CtsMediaBitstreamsTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsMediaHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsMediaHostTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsMediaHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsMediaHostTestCases
index ca30ba3..a0780f1 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsMediaHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsMediaHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsMediaHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsMediaHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsMediaHostTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsMediaHostTestCases',
+        tag='9.0_r11.arm.CtsMediaHostTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsMediaHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsMediaHostTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsMediaStressTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsMediaStressTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsMediaStressTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsMediaStressTestCases
index 3a9f895..85da18c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsMediaStressTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsMediaStressTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsMediaStressTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsMediaStressTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=True,
-        tag='9.0_r10.arm.CtsMediaStressTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsMediaStressTestCases',
+        tag='9.0_r11.arm.CtsMediaStressTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsMediaStressTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaStressTestCases', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='CtsMediaStressTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=18000)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsMediaTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsMediaTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsMediaTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsMediaTestCases
index d4c724c..e6cbc0d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsMediaTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsMediaTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsMediaTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsMediaTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=True,
-        tag='9.0_r10.arm.CtsMediaTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsMediaTestCases',
+        tag='9.0_r11.arm.CtsMediaTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsMediaTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaTestCases', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='CtsMediaTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         login_precondition_commands=['lsblk -do NAME,RM | sed -n s/1$//p | xargs -n1 eject'],
         timeout=36000)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsMidiTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsMidiTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsMidiTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsMidiTestCases
index 6f8350b..579f9de 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsMidiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsMidiTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsMidiTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsMidiTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsMidiTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsMidiTestCases',
+        tag='9.0_r11.arm.CtsMidiTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsMidiTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMidiTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsMidiTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsMocking b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsMocking
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsMocking
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsMocking
index 51f7e09..d43f057 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsMocking
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsMocking
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsMocking'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsMocking'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsMocking',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsMocking',
+        tag='9.0_r11.arm.CtsMocking',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsMocking',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMockingDebuggableTestCases', '--include-filter', 'CtsMockingTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsMocking',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsMonkeyTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsMonkeyTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsMonkeyTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsMonkeyTestCases
index b3360ed..4fcbb06 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsMonkeyTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsMonkeyTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsMonkeyTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsMonkeyTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsMonkeyTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsMonkeyTestCases',
+        tag='9.0_r11.arm.CtsMonkeyTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsMonkeyTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMonkeyTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsMonkeyTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsMultiUser b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsMultiUser
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsMultiUser
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsMultiUser
index 5f452ac..93da2f3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsMultiUser
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsMultiUser
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsMultiUser'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsMultiUser'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsMultiUser',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsMultiUser',
+        tag='9.0_r11.arm.CtsMultiUser',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsMultiUser',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMultiUserHostTestCases', '--include-filter', 'CtsMultiUserTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsMultiUser',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsNNAPITestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsNNAPITestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsNNAPITestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsNNAPITestCases
index cfb4ab7..eb07807 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsNNAPITestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsNNAPITestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsNNAPITestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsNNAPITestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsNNAPITestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsNNAPITestCases',
+        tag='9.0_r11.arm.CtsNNAPITestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsNNAPITestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsNNAPITestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsNNAPITestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsNative b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsNative
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsNative
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsNative
index f63c005..ad618a3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsNative
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsNative
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsNative'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsNative'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsNative',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsNative',
+        tag='9.0_r11.arm.CtsNative',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsNative',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNativeHardwareTestCases', '--include-filter', 'CtsNativeMediaAAudioTestCases', '--include-filter', 'CtsNativeMediaSlTestCases', '--include-filter', 'CtsNativeMediaXaTestCases', '--include-filter', 'CtsNativeNetTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsNative',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=10800)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsNdefTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsNdefTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsNdefTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsNdefTestCases
index c32b3c9..c910e85 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsNdefTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsNdefTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsNdefTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsNdefTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsNdefTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsNdefTestCases',
+        tag='9.0_r11.arm.CtsNdefTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsNdefTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsNdefTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsNdefTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsNet b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsNet
similarity index 94%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsNet
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsNet
index e5478e6..c1409a5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsNet
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsNet
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsNet'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsNet'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsNet',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsNet',
+        tag='9.0_r11.arm.CtsNet',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsNet',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecConfigAttributeTestCases', '--include-filter', 'CtsNetSecConfigBasicDebugDisabledTestCases', '--include-filter', 'CtsNetSecConfigBasicDebugEnabledTestCases', '--include-filter', 'CtsNetSecConfigBasicDomainConfigTestCases', '--include-filter', 'CtsNetSecConfigCleartextTrafficTestCases', '--include-filter', 'CtsNetSecConfigDownloadManagerTestCases', '--include-filter', 'CtsNetSecConfigInvalidPinTestCases', '--include-filter', 'CtsNetSecConfigNestedDomainConfigTestCases', '--include-filter', 'CtsNetSecConfigPrePCleartextTrafficTestCases', '--include-filter', 'CtsNetSecConfigResourcesSrcTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficFalseTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficTrueTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases', '--include-filter', 'CtsNetTestCases', '--include-filter', 'CtsNetTestCasesLegacyApi22', '--include-filter', 'CtsNetTestCasesLegacyPermission22', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsNet',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=30600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsOmapiTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsOmapiTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsOmapiTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsOmapiTestCases
index 5ea6a38..1715048 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsOmapiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsOmapiTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsOmapiTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsOmapiTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsOmapiTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsOmapiTestCases',
+        tag='9.0_r11.arm.CtsOmapiTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsOmapiTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsOmapiTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsOmapiTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsOpenG b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsOpenG
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsOpenG
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsOpenG
index 9af2564..1a80a8a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsOpenG
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsOpenG
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsOpenG'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsOpenG'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='9.0_r10.arm.CtsOpenG',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsOpenG',
+        tag='9.0_r11.arm.CtsOpenG',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsOpenG',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsOpenGLTestCases', '--include-filter', 'CtsOpenGlPerf2TestCases', '--include-filter', 'CtsOpenGlPerfTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsOpenG',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=7200)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsOs b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsOs
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsOs
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsOs
index 33d847e..f1b4743 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsOs
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsOs
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsOs'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsOs'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsOs',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsOs',
+        tag='9.0_r11.arm.CtsOs',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsOs',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsOsHostTestCases', '--include-filter', 'CtsOsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsOs',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         login_precondition_commands=['lsblk -do NAME,RM | sed -n s/1$//p | xargs -n1 eject'],
         timeout=5400)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsPdfTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsPdfTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsPdfTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsPdfTestCases
index d9b89ae..93ef30e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsPdfTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsPdfTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsPdfTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsPdfTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsPdfTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsPdfTestCases',
+        tag='9.0_r11.arm.CtsPdfTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsPdfTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsPdfTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsPdfTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsPerfettoTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsPerfettoTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsPerfettoTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsPerfettoTestCases
index bf75224..6b82c1b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsPerfettoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsPerfettoTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsPerfettoTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsPerfettoTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsPerfettoTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsPerfettoTestCases',
+        tag='9.0_r11.arm.CtsPerfettoTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsPerfettoTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsPerfettoTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsPerfettoTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsPermission b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsPermission
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsPermission
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsPermission
index c18f208..d4eb083 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsPermission
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsPermission
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsPermission'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsPermission'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='9.0_r10.arm.CtsPermission',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsPermission',
+        tag='9.0_r11.arm.CtsPermission',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsPermission',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPermission2TestCases', '--include-filter', 'CtsPermissionTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsPermission',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsPreference b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsPreference
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsPreference
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsPreference
index f1b4e5b..79c56c4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsPreference
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsPreference
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsPreference'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsPreference'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsPreference',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsPreference',
+        tag='9.0_r11.arm.CtsPreference',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsPreference',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPreference2TestCases', '--include-filter', 'CtsPreferenceTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsPreference',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsPrintTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsPrintTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsPrintTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsPrintTestCases
index 162a197..2b55058 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsPrintTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsPrintTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsPrintTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsPrintTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsPrintTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsPrintTestCases',
+        tag='9.0_r11.arm.CtsPrintTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsPrintTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsPrintTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsPrintTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsProtoTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsProtoTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsProtoTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsProtoTestCases
index 3eed180..8969ba1 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsProtoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsProtoTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsProtoTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsProtoTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsProtoTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsProtoTestCases',
+        tag='9.0_r11.arm.CtsProtoTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsProtoTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsProtoTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsProtoTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsProviderTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsProviderTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsProviderTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsProviderTestCases
index bdcba73..e0e4eb1 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsProviderTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsProviderTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsProviderTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsProviderTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsProviderTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsProviderTestCases',
+        tag='9.0_r11.arm.CtsProviderTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsProviderTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsProviderTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsProviderTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         login_precondition_commands=['lsblk -do NAME,RM | sed -n s/1$//p | xargs -n1 eject'],
         timeout=3600)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsRenderscript b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsRenderscript
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsRenderscript
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsRenderscript
index 3daaddf..2823ce4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsRenderscript
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsRenderscript
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsRenderscript'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsRenderscript'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsRenderscript',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsRenderscript',
+        tag='9.0_r11.arm.CtsRenderscript',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsRenderscript',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsRenderscriptLegacyTestCases', '--include-filter', 'CtsRenderscriptTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsRenderscript',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsRs b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsRs
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsRs
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsRs
index a4e47d5..935405d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsRs
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsRs
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsRs'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsRs'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsRs',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsRs',
+        tag='9.0_r11.arm.CtsRs',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsRs',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsRsBlasTestCases', '--include-filter', 'CtsRsCppTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsRs',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSample b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSample
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSample
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSample
index b644a48..157e41b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSample
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSample
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsSample'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsSample'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsSample',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsSample',
+        tag='9.0_r11.arm.CtsSample',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsSample',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSampleDeviceTestCases', '--include-filter', 'CtsSampleHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSample',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSaxTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSaxTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSaxTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSaxTestCases
index 879dba2..b0ccbc4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSaxTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSaxTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsSaxTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsSaxTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsSaxTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsSaxTestCases',
+        tag='9.0_r11.arm.CtsSaxTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsSaxTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSaxTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSaxTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSeccompHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSeccompHostTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSeccompHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSeccompHostTestCases
index 0c399ea..b92cf91 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSeccompHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSeccompHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsSeccompHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsSeccompHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsSeccompHostTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsSeccompHostTestCases',
+        tag='9.0_r11.arm.CtsSeccompHostTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsSeccompHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSeccompHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSeccompHostTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSecureElementAccessControl b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSecureElementAccessControl
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSecureElementAccessControl
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSecureElementAccessControl
index 005630e..8f63016 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSecureElementAccessControl
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSecureElementAccessControl
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsSecureElementAccessControl'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsSecureElementAccessControl'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsSecureElementAccessControl',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsSecureElementAccessControl',
+        tag='9.0_r11.arm.CtsSecureElementAccessControl',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsSecureElementAccessControl',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecureElementAccessControlTestCases1', '--include-filter', 'CtsSecureElementAccessControlTestCases2', '--include-filter', 'CtsSecureElementAccessControlTestCases3', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSecureElementAccessControl',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=7200)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSecurity b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSecurity
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSecurity
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSecurity
index 2e151ac..d3df278 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSecurity
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSecurity
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsSecurity'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsSecurity'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsSecurity',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsSecurity',
+        tag='9.0_r11.arm.CtsSecurity',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsSecurity',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecurityBulletinHostTestCases', '--include-filter', 'CtsSecurityHostTestCases', '--include-filter', 'CtsSecurityTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSecurity',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         precondition_commands=['echo 3 > /proc/sys/kernel/perf_event_paranoid', 'modprobe configs'],
         timeout=12600)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSelinuxTargetSdk b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSelinuxTargetSdk
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSelinuxTargetSdk
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSelinuxTargetSdk
index 4717df4..a846f6f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSelinuxTargetSdk
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSelinuxTargetSdk
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsSelinuxTargetSdk'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsSelinuxTargetSdk'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsSelinuxTargetSdk',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsSelinuxTargetSdk',
+        tag='9.0_r11.arm.CtsSelinuxTargetSdk',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsSelinuxTargetSdk',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSelinuxTargetSdk25TestCases', '--include-filter', 'CtsSelinuxTargetSdk27TestCases', '--include-filter', 'CtsSelinuxTargetSdkCurrentTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSelinuxTargetSdk',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=7200)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSensorTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSensorTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSensorTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSensorTestCases
index a9feda9..7dc6218 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSensorTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSensorTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsSensorTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsSensorTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:arc-cts-unibuild-hw'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=30,
-        tag='9.0_r10.arm.CtsSensorTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsSensorTestCases',
+        tag='9.0_r11.arm.CtsSensorTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsSensorTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSensorTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSensorTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsShortcut b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsShortcut
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsShortcut
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsShortcut
index c64a261..3a36a0f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsShortcut
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsShortcut
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsShortcut'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsShortcut'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsShortcut',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsShortcut',
+        tag='9.0_r11.arm.CtsShortcut',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsShortcut',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsShortcutHostTestCases', '--include-filter', 'CtsShortcutManagerTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsShortcut',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSimRestrictedApisTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSimRestrictedApisTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSimRestrictedApisTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSimRestrictedApisTestCases
index 0eb6a93..500b4cb 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSimRestrictedApisTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSimRestrictedApisTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsSimRestrictedApisTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsSimRestrictedApisTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsSimRestrictedApisTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsSimRestrictedApisTestCases',
+        tag='9.0_r11.arm.CtsSimRestrictedApisTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsSimRestrictedApisTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSimRestrictedApisTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSimRestrictedApisTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSimpleCpuTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSimpleCpuTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSimpleCpuTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSimpleCpuTestCases
index 148f371..8159840 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSimpleCpuTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSimpleCpuTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsSimpleCpuTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsSimpleCpuTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsSimpleCpuTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsSimpleCpuTestCases',
+        tag='9.0_r11.arm.CtsSimpleCpuTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsSimpleCpuTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSimpleCpuTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSimpleCpuTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSimpleperfTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSimpleperfTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSimpleperfTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSimpleperfTestCases
index 6779308..5b19d67 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSimpleperfTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSimpleperfTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsSimpleperfTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsSimpleperfTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='9.0_r10.arm.CtsSimpleperfTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsSimpleperfTestCases',
+        tag='9.0_r11.arm.CtsSimpleperfTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsSimpleperfTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSimpleperfTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSimpleperfTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSkQPTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSkQPTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSkQPTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSkQPTestCases
index dc9db94..8ad8a64 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSkQPTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSkQPTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsSkQPTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsSkQPTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsSkQPTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsSkQPTestCases',
+        tag='9.0_r11.arm.CtsSkQPTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsSkQPTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSkQPTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSkQPTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSliceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSliceTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSliceTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSliceTestCases
index 99403c1..8063228 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSliceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSliceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsSliceTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsSliceTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsSliceTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsSliceTestCases',
+        tag='9.0_r11.arm.CtsSliceTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsSliceTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSliceTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSliceTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSpeechTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSpeechTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSpeechTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSpeechTestCases
index 8937d45..e9fcdaa 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSpeechTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSpeechTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsSpeechTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsSpeechTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='9.0_r10.arm.CtsSpeechTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsSpeechTestCases',
+        tag='9.0_r11.arm.CtsSpeechTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsSpeechTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSpeechTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSpeechTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsStatsdHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsStatsdHostTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsStatsdHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsStatsdHostTestCases
index 4525d1b..ba04fa6 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsStatsdHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsStatsdHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsStatsdHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsStatsdHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsStatsdHostTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsStatsdHostTestCases',
+        tag='9.0_r11.arm.CtsStatsdHostTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsStatsdHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsStatsdHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsStatsdHostTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSustainedPerformanceHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSustainedPerformanceHostTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSustainedPerformanceHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSustainedPerformanceHostTestCases
index dd8d123..f1817d3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSustainedPerformanceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSustainedPerformanceHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsSustainedPerformanceHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsSustainedPerformanceHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsSustainedPerformanceHostTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsSustainedPerformanceHostTestCases',
+        tag='9.0_r11.arm.CtsSustainedPerformanceHostTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsSustainedPerformanceHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSustainedPerformanceHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSustainedPerformanceHostTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSync b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSync
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSync
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSync
index 14b903c..de7703c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSync
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSync
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsSync'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsSync'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsSync',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsSync',
+        tag='9.0_r11.arm.CtsSync',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsSync',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSyncAccountAccessOtherCertTestCases', '--include-filter', 'CtsSyncContentHostTestCases', '--include-filter', 'CtsSyncManagerTestsCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSync',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=7200)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSystem b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSystem
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSystem
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSystem
index 32c65e0..e155a9a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSystem
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsSystem
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsSystem'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsSystem'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsSystem',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsSystem',
+        tag='9.0_r11.arm.CtsSystem',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsSystem',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSystemApiAnnotationTestCases', '--include-filter', 'CtsSystemApiSignatureTestCases', '--include-filter', 'CtsSystemIntentTestCases', '--include-filter', 'CtsSystemUiHostTestCases', '--include-filter', 'CtsSystemUiTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSystem',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=10800)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsTelecom b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsTelecom
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsTelecom
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsTelecom
index 2add0f0..70dfd35 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsTelecom
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsTelecom
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsTelecom'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsTelecom'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='9.0_r10.arm.CtsTelecom',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsTelecom',
+        tag='9.0_r11.arm.CtsTelecom',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsTelecom',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTelecomTestCases', '--include-filter', 'CtsTelecomTestCases2', '--include-filter', 'CtsTelecomTestCases3', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsTelecom',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=7200)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsTelephony b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsTelephony
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsTelephony
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsTelephony
index a22a6b8..575836f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsTelephony
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsTelephony
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsTelephony'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsTelephony'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='9.0_r10.arm.CtsTelephony',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsTelephony',
+        tag='9.0_r11.arm.CtsTelephony',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsTelephony',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTelephony2TestCases', '--include-filter', 'CtsTelephonyTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsTelephony',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsTextTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsTextTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsTextTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsTextTestCases
index 3a997c0..ebe98b1 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsTextTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsTextTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsTextTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsTextTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsTextTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsTextTestCases',
+        tag='9.0_r11.arm.CtsTextTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsTextTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsTextTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsTextTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsTheme b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsTheme
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsTheme
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsTheme
index eb443af..f18216a4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsTheme
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsTheme
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsTheme'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsTheme'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='9.0_r10.arm.CtsTheme',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsTheme',
+        tag='9.0_r11.arm.CtsTheme',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsTheme',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsThemeDeviceTestCases', '--include-filter', 'CtsThemeHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsTheme',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsToast b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsToast
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsToast
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsToast
index ed2ed1a..140437d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsToast
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsToast
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsToast'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsToast'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsToast',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsToast',
+        tag='9.0_r11.arm.CtsToast',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsToast',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsToastLegacyTestCases', '--include-filter', 'CtsToastTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsToast',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsTransitionTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsTransitionTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsTransitionTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsTransitionTestCases
index acb7567..2617d11 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsTransitionTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsTransitionTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsTransitionTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsTransitionTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='9.0_r10.arm.CtsTransitionTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsTransitionTestCases',
+        tag='9.0_r11.arm.CtsTransitionTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsTransitionTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsTransitionTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsTransitionTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsTrustedVoiceHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsTrustedVoiceHostTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsTrustedVoiceHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsTrustedVoiceHostTestCases
index 043a2ae..e3aa716 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsTrustedVoiceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsTrustedVoiceHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsTrustedVoiceHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsTrustedVoiceHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsTrustedVoiceHostTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsTrustedVoiceHostTestCases',
+        tag='9.0_r11.arm.CtsTrustedVoiceHostTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsTrustedVoiceHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsTrustedVoiceHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsTrustedVoiceHostTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsTv b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsTv
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsTv
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsTv
index 0b2ab32..659804d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsTv
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsTv
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsTv'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsTv'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='9.0_r10.arm.CtsTv',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsTv',
+        tag='9.0_r11.arm.CtsTv',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsTv',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTvProviderTestCases', '--include-filter', 'CtsTvTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsTv',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsUi b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsUi
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsUi
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsUi
index be6c43e..9d59443 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsUi
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsUi
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsUi'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsUi'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='9.0_r10.arm.CtsUi',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsUi',
+        tag='9.0_r11.arm.CtsUi',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsUi',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUiAutomationTestCases', '--include-filter', 'CtsUiDeviceTestCases', '--include-filter', 'CtsUiRenderingTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsUi',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=7200)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsUidIsolationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsUidIsolationTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsUidIsolationTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsUidIsolationTestCases
index 4bd5ef5..3afeaf8 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsUidIsolationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsUidIsolationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsUidIsolationTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsUidIsolationTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsUidIsolationTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsUidIsolationTestCases',
+        tag='9.0_r11.arm.CtsUidIsolationTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsUidIsolationTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsUidIsolationTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsUidIsolationTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsUsageStatsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsUsageStatsTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsUsageStatsTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsUsageStatsTestCases
index 860d258..f3a2bcf 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsUsageStatsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsUsageStatsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsUsageStatsTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsUsageStatsTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsUsageStatsTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsUsageStatsTestCases',
+        tag='9.0_r11.arm.CtsUsageStatsTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsUsageStatsTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsUsageStatsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsUsageStatsTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsUsbTests b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsUsbTests
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsUsbTests
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsUsbTests
index 416b96e..ae21ae2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsUsbTests
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsUsbTests
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsUsbTests'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsUsbTests'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='9.0_r10.arm.CtsUsbTests',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsUsbTests',
+        tag='9.0_r11.arm.CtsUsbTests',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsUsbTests',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsUsbTests', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsUsbTests',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsUtilTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsUtilTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsUtilTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsUtilTestCases
index a7dd2d2..fdc8db3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsUtilTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsUtilTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsUtilTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsUtilTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsUtilTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsUtilTestCases',
+        tag='9.0_r11.arm.CtsUtilTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsUtilTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsUtilTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsUtilTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsVideoTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsVideoTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsVideoTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsVideoTestCases
index f5d1469..c46e87c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsVideoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsVideoTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsVideoTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsVideoTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsVideoTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsVideoTestCases',
+        tag='9.0_r11.arm.CtsVideoTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsVideoTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsVideoTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsVideoTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsViewTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsViewTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsViewTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsViewTestCases
index 8735161..4a87aa2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsViewTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsViewTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsViewTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsViewTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,15 +20,15 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsViewTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsViewTestCases',
+        tag='9.0_r11.arm.CtsViewTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsViewTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsViewTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsViewTestCases',
         target_plan=None,
         bundle='arm',
         extra_artifacts=['/storage/emulated/0/SurfaceViewSyncTest/'],
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         precondition_commands=['sleep 60'],
         timeout=3600)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsVmTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsVmTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsVmTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsVmTestCases
index 6542a1b..b9fb99b23 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsVmTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsVmTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsVmTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsVmTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsVmTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsVmTestCases',
+        tag='9.0_r11.arm.CtsVmTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsVmTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsVmTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsVmTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsVoice b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsVoice
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsVoice
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsVoice
index 2ffa611..34ff2e2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsVoice
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsVoice
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsVoice'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsVoice'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=3,
-        tag='9.0_r10.arm.CtsVoice',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsVoice',
+        tag='9.0_r11.arm.CtsVoice',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsVoice',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsVoiceInteractionTestCases', '--include-filter', 'CtsVoiceSettingsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsVoice',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsVrTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsVrTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsVrTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsVrTestCases
index 8b07e1d..cdb3772 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsVrTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsVrTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsVrTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsVrTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsVrTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsVrTestCases',
+        tag='9.0_r11.arm.CtsVrTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsVrTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsVrTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsVrTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsWebkitTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsWebkitTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsWebkitTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsWebkitTestCases
index 4d00684..17199e2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsWebkitTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsWebkitTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsWebkitTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsWebkitTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsWebkitTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsWebkitTestCases',
+        tag='9.0_r11.arm.CtsWebkitTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsWebkitTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsWebkitTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsWebkitTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsWidgetTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsWidgetTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsWidgetTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsWidgetTestCases
index f123c4c..9bcda30 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsWidgetTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsWidgetTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsWidgetTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsWidgetTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsWidgetTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsWidgetTestCases',
+        tag='9.0_r11.arm.CtsWidgetTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsWidgetTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsWidgetTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsWidgetTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsWindowManagerDeviceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsWindowManagerDeviceTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsWindowManagerDeviceTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsWindowManagerDeviceTestCases
index 3b19593..35ce010 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsWindowManagerDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsWindowManagerDeviceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsWindowManagerDeviceTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsWindowManagerDeviceTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsWindowManagerDeviceTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsWindowManagerDeviceTestCases',
+        tag='9.0_r11.arm.CtsWindowManagerDeviceTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsWindowManagerDeviceTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsWindowManagerDeviceTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsWindowManagerDeviceTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsWrap b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsWrap
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsWrap
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsWrap
index b621dab..5c18222 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsWrap
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsWrap
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.CtsWrap'
+NAME = 'cheets_CTS_P.9.0_r11.arm.CtsWrap'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.CtsWrap',
-        test_name='cheets_CTS_P.9.0_r10.arm.CtsWrap',
+        tag='9.0_r11.arm.CtsWrap',
+        test_name='cheets_CTS_P.9.0_r11.arm.CtsWrap',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsWrapNoWrapTestCases', '--include-filter', 'CtsWrapWrapDebugMallocDebugTestCases', '--include-filter', 'CtsWrapWrapDebugTestCases', '--include-filter', 'CtsWrapWrapNoDebugTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsWrap',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=9000)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases
index bd97696..04b485f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r10.arm.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases',
+        tag='9.0_r11.arm.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAbiOverrideHostTestCases', '--include-filter', 'CtsAccelerationTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=172800)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases
index d1157a9..a44321f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r10.arm.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases',
+        tag='9.0_r11.arm.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAccessibilityServiceTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=172800)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases
index ef974bc..cdb7541 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r10.arm.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases',
+        tag='9.0_r11.arm.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAccessibilityTestCases', '--include-filter', 'CtsAccountManagerTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=172800)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases
index efb929b..71d93fd 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r10.arm.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases',
+        tag='9.0_r11.arm.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsActivityManagerDeviceSdk25TestCases', '--include-filter', 'CtsActivityManagerDeviceTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=172800)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases
similarity index 95%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases
index 07e7e4b..4e2c80f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         iterations=1,
         max_retry=9,
         enable_default_apps=True,
-        tag='9.0_r10.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases',
+        tag='9.0_r11.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAdminPackageInstallerTestCases', '--include-filter', 'CtsAdminTestCases', '--include-filter', 'CtsAlarmClockTestCases', '--include-filter', 'CtsAlarmManagerTestCases', '--include-filter', 'CtsAndroidAppTestCases', '--include-filter', 'CtsAndroidTestBase27ApiSignatureTestCases', '--include-filter', 'CtsAndroidTestMockCurrentApiSignatureTestCases', '--include-filter', 'CtsAndroidTestRunnerCurrentApiSignatureTestCases', '--include-filter', 'CtsAnimationTestCases', '--include-filter', 'CtsApacheHttpLegacy27ApiSignatureTestCases', '--include-filter', 'CtsApacheHttpLegacyCurrentApiSignatureTestCases', '--include-filter', 'CtsApacheHttpLegacyUsesLibraryApiSignatureTestCases', '--include-filter', 'CtsAppComponentFactoryTestCases', '--include-filter', 'CtsAppSecurityHostTestCases', '--include-filter', 'CtsAppTestCases', '--include-filter', 'CtsAppUsageHostTestCases', '--include-filter', 'CtsAppWidgetTestCases', '--include-filter', 'CtsAslrMallocTestCases', '--include-filter', 'CtsAssistTestCases', '--include-filter', 'CtsAtraceHostTestCases', '--include-filter', 'CtsAutoFillServiceTestCases', '--include-filter', 'CtsBackgroundRestrictionsTestCases', '--include-filter', 'CtsBackupHostTestCases', '--include-filter', 'CtsBackupTestCases', '--include-filter', 'CtsBatterySavingTestCases', '--include-filter', 'CtsBionicTestCases', '--include-filter', 'CtsBluetoothTestCases', '--include-filter', 'CtsBootStatsTestCases', '--include-filter', 'CtsCalendarcommon2TestCases', '--include-filter', 'CtsCameraApi25TestCases', '--include-filter', 'CtsCameraTestCases', '--include-filter', 'CtsCarTestCases', '--include-filter', 'CtsCarrierApiTestCases', '--include-filter', 'CtsColorModeTestCases', '--include-filter', 'CtsCompilationTestCases', '--include-filter', 'CtsContactsProviderWipe', '--include-filter', 'CtsContentTestCases', '--include-filter', 'CtsCppToolsTestCases', '--include-filter', 'CtsCurrentApiSignatureTestCases', '--include-filter', 'CtsDatabaseTestCases', '--include-filter', 'CtsDebugTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         login_precondition_commands=['lsblk -do NAME,RM | sed -n s/1$//p | xargs -n1 eject'],
         timeout=172800)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases
index 524b7cf..a4b16f5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=15,
-        tag='9.0_r10.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases',
+        tag='9.0_r11.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDeqpTestCases', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsDeqpTestCases_-_CtsDeqpTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=172800)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases
similarity index 90%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases
index b60b1c1..a9084bc 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r10.arm.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases',
+        tag='9.0_r11.arm.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeviceIdleHostTestCases', '--include-filter', 'CtsDevicePolicyManagerTestCases', '--include-filter', 'CtsDexMetadataHostTestCases', '--include-filter', 'CtsDisplayTestCases', '--include-filter', 'CtsDpiTestCases', '--include-filter', 'CtsDpiTestCases2', '--include-filter', 'CtsDreamsTestCases', '--include-filter', 'CtsDrmTestCases', '--include-filter', 'CtsDumpsysHostTestCases', '--include-filter', 'CtsDynamicLinkerTestCases', '--include-filter', 'CtsEdiHostTestCases', '--include-filter', 'CtsEffectTestCases', '--include-filter', 'CtsExternalServiceTestCases', '--include-filter', 'CtsExternalSourcesTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=172800)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
index 0f03907..b04b251 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r10.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases',
+        tag='9.0_r11.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsFileSystemTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsFileSystemTestCases_-_CtsFileSystemTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=172800)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases
similarity index 94%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases
index a9bc0f6..76a6202 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=30,
-        tag='9.0_r10.arm.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases',
+        tag='9.0_r11.arm.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsFragmentTestCases', '--include-filter', 'CtsFragmentTestCasesSdk26', '--include-filter', 'CtsGestureTestCases', '--include-filter', 'CtsGpuToolsHostTestCases', '--include-filter', 'CtsGraphicsTestCases', '--include-filter', 'CtsHardwareTestCases', '--include-filter', 'CtsHarmfulAppWarningHostTestCases', '--include-filter', 'CtsHiddenApiBlacklistApi27TestCases', '--include-filter', 'CtsHiddenApiBlacklistCurrentApiTestCases', '--include-filter', 'CtsHiddenApiBlacklistDebugClassTestCases', '--include-filter', 'CtsHiddenApiKillswitchDebugClassTestCases', '--include-filter', 'CtsHiddenApiKillswitchWhitelistTestCases', '--include-filter', 'CtsHiddenApiKillswitchWildcardTestCases', '--include-filter', 'CtsHostTzDataTests', '--include-filter', 'CtsHostsideNetworkTests', '--include-filter', 'CtsHostsideNumberBlockingTestCases', '--include-filter', 'CtsHostsideTvTests', '--include-filter', 'CtsHostsideWebViewTests', '--include-filter', 'CtsIcuTestCases', '--include-filter', 'CtsIncidentHostTestCases', '--include-filter', 'CtsInlineMockingTestCases', '--include-filter', 'CtsInputMethodServiceHostTestCases', '--include-filter', 'CtsInputMethodTestCases', '--include-filter', 'CtsIntentSignatureTestCases', '--include-filter', 'CtsJankDeviceTestCases', '--include-filter', 'CtsJdwpSecurityHostTestCases', '--include-filter', 'CtsJdwpTestCases', '--include-filter', 'CtsJniTestCases', '--include-filter', 'CtsJobSchedulerSharedUidTestCases', '--include-filter', 'CtsJobSchedulerTestCases', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         login_precondition_commands=['lsblk -do NAME,RM | sed -n s/1$//p | xargs -n1 eject'],
         timeout=172800)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases
similarity index 97%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases
index 2af9d66..f90eeb7 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r10.arm.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases',
+        tag='9.0_r11.arm.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiAttachingHostTestCases', '--include-filter', 'CtsJvmtiAttachingTestCases', '--include-filter', 'CtsJvmtiRedefineClassesHostTestCases', '--include-filter', 'CtsJvmtiRunTest1900HostTestCases', '--include-filter', 'CtsJvmtiRunTest1901HostTestCases', '--include-filter', 'CtsJvmtiRunTest1902HostTestCases', '--include-filter', 'CtsJvmtiRunTest1903HostTestCases', '--include-filter', 'CtsJvmtiRunTest1904HostTestCases', '--include-filter', 'CtsJvmtiRunTest1906HostTestCases', '--include-filter', 'CtsJvmtiRunTest1907HostTestCases', '--include-filter', 'CtsJvmtiRunTest1908HostTestCases', '--include-filter', 'CtsJvmtiRunTest1909HostTestCases', '--include-filter', 'CtsJvmtiRunTest1910HostTestCases', '--include-filter', 'CtsJvmtiRunTest1911HostTestCases', '--include-filter', 'CtsJvmtiRunTest1912HostTestCases', '--include-filter', 'CtsJvmtiRunTest1913HostTestCases', '--include-filter', 'CtsJvmtiRunTest1914HostTestCases', '--include-filter', 'CtsJvmtiRunTest1915HostTestCases', '--include-filter', 'CtsJvmtiRunTest1916HostTestCases', '--include-filter', 'CtsJvmtiRunTest1917HostTestCases', '--include-filter', 'CtsJvmtiRunTest1920HostTestCases', '--include-filter', 'CtsJvmtiRunTest1921HostTestCases', '--include-filter', 'CtsJvmtiRunTest1922HostTestCases', '--include-filter', 'CtsJvmtiRunTest1923HostTestCases', '--include-filter', 'CtsJvmtiRunTest1924HostTestCases', '--include-filter', 'CtsJvmtiRunTest1925HostTestCases', '--include-filter', 'CtsJvmtiRunTest1926HostTestCases', '--include-filter', 'CtsJvmtiRunTest1927HostTestCases', '--include-filter', 'CtsJvmtiRunTest1928HostTestCases', '--include-filter', 'CtsJvmtiRunTest1930HostTestCases', '--include-filter', 'CtsJvmtiRunTest1931HostTestCases', '--include-filter', 'CtsJvmtiRunTest1932HostTestCases', '--include-filter', 'CtsJvmtiRunTest1933HostTestCases', '--include-filter', 'CtsJvmtiRunTest1934HostTestCases', '--include-filter', 'CtsJvmtiRunTest1936HostTestCases', '--include-filter', 'CtsJvmtiRunTest1937HostTestCases', '--include-filter', 'CtsJvmtiRunTest1939HostTestCases', '--include-filter', 'CtsJvmtiRunTest1941HostTestCases', '--include-filter', 'CtsJvmtiRunTest1942HostTestCases', '--include-filter', 'CtsJvmtiRunTest1943HostTestCases', '--include-filter', 'CtsJvmtiRunTest902HostTestCases', '--include-filter', 'CtsJvmtiRunTest903HostTestCases', '--include-filter', 'CtsJvmtiRunTest904HostTestCases', '--include-filter', 'CtsJvmtiRunTest905HostTestCases', '--include-filter', 'CtsJvmtiRunTest906HostTestCases', '--include-filter', 'CtsJvmtiRunTest907HostTestCases', '--include-filter', 'CtsJvmtiRunTest908HostTestCases', '--include-filter', 'CtsJvmtiRunTest910HostTestCases', '--include-filter', 'CtsJvmtiRunTest911HostTestCases', '--include-filter', 'CtsJvmtiRunTest912HostTestCases', '--include-filter', 'CtsJvmtiRunTest913HostTestCases', '--include-filter', 'CtsJvmtiRunTest914HostTestCases', '--include-filter', 'CtsJvmtiRunTest915HostTestCases', '--include-filter', 'CtsJvmtiRunTest917HostTestCases', '--include-filter', 'CtsJvmtiRunTest918HostTestCases', '--include-filter', 'CtsJvmtiRunTest919HostTestCases', '--include-filter', 'CtsJvmtiRunTest920HostTestCases', '--include-filter', 'CtsJvmtiRunTest922HostTestCases', '--include-filter', 'CtsJvmtiRunTest923HostTestCases', '--include-filter', 'CtsJvmtiRunTest924HostTestCases', '--include-filter', 'CtsJvmtiRunTest926HostTestCases', '--include-filter', 'CtsJvmtiRunTest927HostTestCases', '--include-filter', 'CtsJvmtiRunTest928HostTestCases', '--include-filter', 'CtsJvmtiRunTest930HostTestCases', '--include-filter', 'CtsJvmtiRunTest931HostTestCases', '--include-filter', 'CtsJvmtiRunTest932HostTestCases', '--include-filter', 'CtsJvmtiRunTest940HostTestCases', '--include-filter', 'CtsJvmtiRunTest942HostTestCases', '--include-filter', 'CtsJvmtiRunTest944HostTestCases', '--include-filter', 'CtsJvmtiRunTest945HostTestCases', '--include-filter', 'CtsJvmtiRunTest947HostTestCases', '--include-filter', 'CtsJvmtiRunTest951HostTestCases', '--include-filter', 'CtsJvmtiRunTest982HostTestCases', '--include-filter', 'CtsJvmtiRunTest983HostTestCases', '--include-filter', 'CtsJvmtiRunTest984HostTestCases', '--include-filter', 'CtsJvmtiRunTest985HostTestCases', '--include-filter', 'CtsJvmtiRunTest986HostTestCases', '--include-filter', 'CtsJvmtiRunTest988HostTestCases', '--include-filter', 'CtsJvmtiRunTest989HostTestCases', '--include-filter', 'CtsJvmtiRunTest990HostTestCases', '--include-filter', 'CtsJvmtiRunTest991HostTestCases', '--include-filter', 'CtsJvmtiRunTest992HostTestCases', '--include-filter', 'CtsJvmtiRunTest993HostTestCases', '--include-filter', 'CtsJvmtiRunTest994HostTestCases', '--include-filter', 'CtsJvmtiRunTest995HostTestCases', '--include-filter', 'CtsJvmtiRunTest996HostTestCases', '--include-filter', 'CtsJvmtiRunTest997HostTestCases', '--include-filter', 'CtsJvmtiTaggingHostTestCases', '--include-filter', 'CtsJvmtiTrackingHostTestCases', '--include-filter', 'CtsKernelConfigTestCases', '--include-filter', 'CtsKeystoreTestCases', '--include-filter', 'CtsLeanbackJankTestCases', '--include-filter', 'CtsLegacyNotificationTestCases', '--include-filter', 'CtsLibcoreFileIOTestCases', '--include-filter', 'CtsLibcoreJsr166TestCases', '--include-filter', 'CtsLibcoreLegacy22TestCases', '--include-filter', 'CtsLibcoreOjTestCases', '--include-filter', 'CtsLibcoreOkHttpTestCases', '--include-filter', 'CtsLibcoreTestCases', '--include-filter', 'CtsLibcoreWycheproofBCTestCases', '--include-filter', 'CtsLibcoreWycheproofConscryptTestCases', '--include-filter', 'CtsLiblogTestCases', '--include-filter', 'CtsLocation2TestCases', '--include-filter', 'CtsLocationTestCases', '--include-filter', 'CtsLogdTestCases', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=172800)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases
index 92bcbcd..8e340eb 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         iterations=1,
         max_retry=9,
         needs_push_media=True,
-        tag='9.0_r10.arm.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases',
+        tag='9.0_r11.arm.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaBitstreamsTestCases', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=172800)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases
index 75514b2..716bc62 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r10.arm.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases',
+        tag='9.0_r11.arm.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsMediaHostTestCases_-_CtsMediaHostTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=172800)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases
index 7cf488f..1165702 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         iterations=1,
         max_retry=9,
         needs_push_media=True,
-        tag='9.0_r10.arm.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases',
+        tag='9.0_r11.arm.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaStressTestCases', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='all.CtsMediaStressTestCases_-_CtsMediaStressTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=172800)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsMediaTestCases_-_CtsMediaTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsMediaTestCases_-_CtsMediaTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsMediaTestCases_-_CtsMediaTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsMediaTestCases_-_CtsMediaTestCases
index 21cb42e..bd116ab 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsMediaTestCases_-_CtsMediaTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsMediaTestCases_-_CtsMediaTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.all.CtsMediaTestCases_-_CtsMediaTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.all.CtsMediaTestCases_-_CtsMediaTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         iterations=1,
         max_retry=9,
         needs_push_media=True,
-        tag='9.0_r10.arm.all.CtsMediaTestCases_-_CtsMediaTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.all.CtsMediaTestCases_-_CtsMediaTestCases',
+        tag='9.0_r11.arm.all.CtsMediaTestCases_-_CtsMediaTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.all.CtsMediaTestCases_-_CtsMediaTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaTestCases', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='all.CtsMediaTestCases_-_CtsMediaTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         login_precondition_commands=['lsblk -do NAME,RM | sed -n s/1$//p | xargs -n1 eject'],
         timeout=172800)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases
similarity index 96%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases
index b238c44..79a4ac8 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r10.arm.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases',
+        tag='9.0_r11.arm.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMidiTestCases', '--include-filter', 'CtsMockingDebuggableTestCases', '--include-filter', 'CtsMockingTestCases', '--include-filter', 'CtsMonkeyTestCases', '--include-filter', 'CtsMultiUserHostTestCases', '--include-filter', 'CtsMultiUserTestCases', '--include-filter', 'CtsNNAPITestCases', '--include-filter', 'CtsNativeHardwareTestCases', '--include-filter', 'CtsNativeMediaAAudioTestCases', '--include-filter', 'CtsNativeMediaSlTestCases', '--include-filter', 'CtsNativeMediaXaTestCases', '--include-filter', 'CtsNativeNetTestCases', '--include-filter', 'CtsNdefTestCases', '--include-filter', 'CtsNetSecConfigAttributeTestCases', '--include-filter', 'CtsNetSecConfigBasicDebugDisabledTestCases', '--include-filter', 'CtsNetSecConfigBasicDebugEnabledTestCases', '--include-filter', 'CtsNetSecConfigBasicDomainConfigTestCases', '--include-filter', 'CtsNetSecConfigCleartextTrafficTestCases', '--include-filter', 'CtsNetSecConfigDownloadManagerTestCases', '--include-filter', 'CtsNetSecConfigInvalidPinTestCases', '--include-filter', 'CtsNetSecConfigNestedDomainConfigTestCases', '--include-filter', 'CtsNetSecConfigPrePCleartextTrafficTestCases', '--include-filter', 'CtsNetSecConfigResourcesSrcTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficFalseTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficTrueTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases', '--include-filter', 'CtsNetTestCases', '--include-filter', 'CtsNetTestCasesLegacyApi22', '--include-filter', 'CtsNetTestCasesLegacyPermission22', '--include-filter', 'CtsOmapiTestCases', '--include-filter', 'CtsOpenGLTestCases', '--include-filter', 'CtsOpenGlPerf2TestCases', '--include-filter', 'CtsOpenGlPerfTestCases', '--include-filter', 'CtsOsHostTestCases', '--include-filter', 'CtsOsTestCases', '--include-filter', 'CtsPdfTestCases', '--include-filter', 'CtsPerfettoTestCases', '--include-filter', 'CtsPermission2TestCases', '--include-filter', 'CtsPermissionTestCases', '--include-filter', 'CtsPreference2TestCases', '--include-filter', 'CtsPreferenceTestCases', '--include-filter', 'CtsPrintTestCases', '--include-filter', 'CtsProtoTestCases', '--include-filter', 'CtsProviderTestCases', '--include-filter', 'CtsRenderscriptLegacyTestCases', '--include-filter', 'CtsRenderscriptTestCases', '--include-filter', 'CtsRsBlasTestCases', '--include-filter', 'CtsRsCppTestCases', '--include-filter', 'CtsSampleDeviceTestCases', '--include-filter', 'CtsSampleHostTestCases', '--include-filter', 'CtsSaxTestCases', '--include-filter', 'CtsSeccompHostTestCases', '--include-filter', 'CtsSecureElementAccessControlTestCases1', '--include-filter', 'CtsSecureElementAccessControlTestCases2', '--include-filter', 'CtsSecureElementAccessControlTestCases3', '--include-filter', 'CtsSecurityBulletinHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         login_precondition_commands=['lsblk -do NAME,RM | sed -n s/1$//p | xargs -n1 eject'],
         timeout=172800)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases
index 583f7b6..40b76d3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r10.arm.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases',
+        tag='9.0_r11.arm.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSecurityHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         precondition_commands=['echo 3 > /proc/sys/kernel/perf_event_paranoid', 'modprobe configs'],
         timeout=172800)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases
index c3bf130..fdd7fd5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r10.arm.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases',
+        tag='9.0_r11.arm.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecurityTestCases', '--include-filter', 'CtsSelinuxTargetSdk25TestCases', '--include-filter', 'CtsSelinuxTargetSdk27TestCases', '--include-filter', 'CtsSelinuxTargetSdkCurrentTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=172800)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsSensorTestCases_-_CtsSensorTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsSensorTestCases_-_CtsSensorTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsSensorTestCases_-_CtsSensorTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsSensorTestCases_-_CtsSensorTestCases
index b28c6ba..9ea09fa 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsSensorTestCases_-_CtsSensorTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsSensorTestCases_-_CtsSensorTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.all.CtsSensorTestCases_-_CtsSensorTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.all.CtsSensorTestCases_-_CtsSensorTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=30,
-        tag='9.0_r10.arm.all.CtsSensorTestCases_-_CtsSensorTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.all.CtsSensorTestCases_-_CtsSensorTestCases',
+        tag='9.0_r11.arm.all.CtsSensorTestCases_-_CtsSensorTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.all.CtsSensorTestCases_-_CtsSensorTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSensorTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsSensorTestCases_-_CtsSensorTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=172800)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsShortcutHostTestCases_-_CtsVideoTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsShortcutHostTestCases_-_CtsVideoTestCases
similarity index 94%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsShortcutHostTestCases_-_CtsVideoTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsShortcutHostTestCases_-_CtsVideoTestCases
index d102200..2214faf 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsShortcutHostTestCases_-_CtsVideoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsShortcutHostTestCases_-_CtsVideoTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.all.CtsShortcutHostTestCases_-_CtsVideoTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.all.CtsShortcutHostTestCases_-_CtsVideoTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r10.arm.all.CtsShortcutHostTestCases_-_CtsVideoTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.all.CtsShortcutHostTestCases_-_CtsVideoTestCases',
+        tag='9.0_r11.arm.all.CtsShortcutHostTestCases_-_CtsVideoTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.all.CtsShortcutHostTestCases_-_CtsVideoTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsShortcutHostTestCases', '--include-filter', 'CtsShortcutManagerTestCases', '--include-filter', 'CtsSimRestrictedApisTestCases', '--include-filter', 'CtsSimpleCpuTestCases', '--include-filter', 'CtsSimpleperfTestCases', '--include-filter', 'CtsSkQPTestCases', '--include-filter', 'CtsSliceTestCases', '--include-filter', 'CtsSpeechTestCases', '--include-filter', 'CtsStatsdHostTestCases', '--include-filter', 'CtsSustainedPerformanceHostTestCases', '--include-filter', 'CtsSyncAccountAccessOtherCertTestCases', '--include-filter', 'CtsSyncContentHostTestCases', '--include-filter', 'CtsSyncManagerTestsCases', '--include-filter', 'CtsSystemApiAnnotationTestCases', '--include-filter', 'CtsSystemApiSignatureTestCases', '--include-filter', 'CtsSystemIntentTestCases', '--include-filter', 'CtsSystemUiHostTestCases', '--include-filter', 'CtsSystemUiTestCases', '--include-filter', 'CtsTelecomTestCases', '--include-filter', 'CtsTelecomTestCases2', '--include-filter', 'CtsTelecomTestCases3', '--include-filter', 'CtsTelephony2TestCases', '--include-filter', 'CtsTelephonyTestCases', '--include-filter', 'CtsTextTestCases', '--include-filter', 'CtsThemeDeviceTestCases', '--include-filter', 'CtsThemeHostTestCases', '--include-filter', 'CtsToastLegacyTestCases', '--include-filter', 'CtsToastTestCases', '--include-filter', 'CtsTransitionTestCases', '--include-filter', 'CtsTrustedVoiceHostTestCases', '--include-filter', 'CtsTvProviderTestCases', '--include-filter', 'CtsTvTestCases', '--include-filter', 'CtsUiAutomationTestCases', '--include-filter', 'CtsUiDeviceTestCases', '--include-filter', 'CtsUiRenderingTestCases', '--include-filter', 'CtsUidIsolationTestCases', '--include-filter', 'CtsUsageStatsTestCases', '--include-filter', 'CtsUsbTests', '--include-filter', 'CtsUtilTestCases', '--include-filter', 'CtsVideoTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsShortcutHostTestCases_-_CtsVideoTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=172800)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsViewTestCases_-_CtsViewTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsViewTestCases_-_CtsViewTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsViewTestCases_-_CtsViewTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsViewTestCases_-_CtsViewTestCases
index 684a493..6026b00 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsViewTestCases_-_CtsViewTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsViewTestCases_-_CtsViewTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.all.CtsViewTestCases_-_CtsViewTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.arm.all.CtsViewTestCases_-_CtsViewTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,15 +21,15 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r10.arm.all.CtsViewTestCases_-_CtsViewTestCases',
-        test_name='cheets_CTS_P.9.0_r10.arm.all.CtsViewTestCases_-_CtsViewTestCases',
+        tag='9.0_r11.arm.all.CtsViewTestCases_-_CtsViewTestCases',
+        test_name='cheets_CTS_P.9.0_r11.arm.all.CtsViewTestCases_-_CtsViewTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsViewTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsViewTestCases_-_CtsViewTestCases',
         target_plan=None,
         bundle='arm',
         extra_artifacts=['/storage/emulated/0/SurfaceViewSyncTest/'],
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         precondition_commands=['sleep 60'],
         timeout=172800)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsVmTestCases_-_vm-tests-tf b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsVmTestCases_-_vm-tests-tf
similarity index 91%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsVmTestCases_-_vm-tests-tf
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsVmTestCases_-_vm-tests-tf
index 4c557cc..bcbef6c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsVmTestCases_-_vm-tests-tf
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsVmTestCases_-_vm-tests-tf
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.all.CtsVmTestCases_-_vm-tests-tf'
+NAME = 'cheets_CTS_P.9.0_r11.arm.all.CtsVmTestCases_-_vm-tests-tf'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r10.arm.all.CtsVmTestCases_-_vm-tests-tf',
-        test_name='cheets_CTS_P.9.0_r10.arm.all.CtsVmTestCases_-_vm-tests-tf',
+        tag='9.0_r11.arm.all.CtsVmTestCases_-_vm-tests-tf',
+        test_name='cheets_CTS_P.9.0_r11.arm.all.CtsVmTestCases_-_vm-tests-tf',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsVmTestCases', '--include-filter', 'CtsVoiceInteractionTestCases', '--include-filter', 'CtsVoiceSettingsTestCases', '--include-filter', 'CtsVrTestCases', '--include-filter', 'CtsWebkitTestCases', '--include-filter', 'CtsWidgetTestCases', '--include-filter', 'CtsWindowManagerDeviceTestCases', '--include-filter', 'CtsWrapNoWrapTestCases', '--include-filter', 'CtsWrapWrapDebugMallocDebugTestCases', '--include-filter', 'CtsWrapWrapDebugTestCases', '--include-filter', 'CtsWrapWrapNoDebugTestCases', '--include-filter', 'cts-system-all.api', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases1', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases2', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases3', '--include-filter', 'vm-tests-tf', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsVmTestCases_-_vm-tests-tf',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=172800)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.cts-system-all.api b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.cts-system-all.api
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.cts-system-all.api
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.cts-system-all.api
index e9ce910..f6a560c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.cts-system-all.api
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.cts-system-all.api
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.cts-system-all.api'
+NAME = 'cheets_CTS_P.9.0_r11.arm.cts-system-all.api'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.cts-system-all.api',
-        test_name='cheets_CTS_P.9.0_r10.arm.cts-system-all.api',
+        tag='9.0_r11.arm.cts-system-all.api',
+        test_name='cheets_CTS_P.9.0_r11.arm.cts-system-all.api',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'cts-system-all.api', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='cts-system-all.api',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.signed-CtsSecureElementAccessControl b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.signed-CtsSecureElementAccessControl
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.signed-CtsSecureElementAccessControl
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.signed-CtsSecureElementAccessControl
index 3ec6f23..5af6db5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.signed-CtsSecureElementAccessControl
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.signed-CtsSecureElementAccessControl
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.signed-CtsSecureElementAccessControl'
+NAME = 'cheets_CTS_P.9.0_r11.arm.signed-CtsSecureElementAccessControl'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.signed-CtsSecureElementAccessControl',
-        test_name='cheets_CTS_P.9.0_r10.arm.signed-CtsSecureElementAccessControl',
+        tag='9.0_r11.arm.signed-CtsSecureElementAccessControl',
+        test_name='cheets_CTS_P.9.0_r11.arm.signed-CtsSecureElementAccessControl',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases1', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases2', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases3', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='signed-CtsSecureElementAccessControl',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=7200)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.tradefed-run-collect-tests-only-internal b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.tradefed-run-collect-tests-only-internal
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.tradefed-run-collect-tests-only-internal
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.tradefed-run-collect-tests-only-internal
index cd74bec..cf373c1 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.tradefed-run-collect-tests-only-internal
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.tradefed-run-collect-tests-only-internal
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.tradefed-run-collect-tests-only-internal'
+NAME = 'cheets_CTS_P.9.0_r11.arm.tradefed-run-collect-tests-only-internal'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 0
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=0,
-        tag='9.0_r10.arm.tradefed-run-collect-tests-only-internal',
-        test_name='cheets_CTS_P.9.0_r10.arm.tradefed-run-collect-tests-only-internal',
+        tag='9.0_r11.arm.tradefed-run-collect-tests-only-internal',
+        test_name='cheets_CTS_P.9.0_r11.arm.tradefed-run-collect-tests-only-internal',
         run_template=['run', 'commandAndExit', 'collect-tests-only', '--disable-reboot', '--module-arg', 'CtsMediaTestCases:skip-media-download:true', '--module-arg', 'CtsMediaStressTestCases:skip-media-download:true', '--module-arg', 'CtsMediaBitstreamsTestCases:skip-media-download:true', '--dynamic-config-url='],
         retry_template=None,
         target_module=None,
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=9000)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.vm-tests-tf b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.vm-tests-tf
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.vm-tests-tf
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.vm-tests-tf
index f9a71ca..dde0c7d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.vm-tests-tf
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.vm-tests-tf
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.vm-tests-tf'
+NAME = 'cheets_CTS_P.9.0_r11.arm.vm-tests-tf'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.vm-tests-tf',
-        test_name='cheets_CTS_P.9.0_r10.arm.vm-tests-tf',
+        tag='9.0_r11.arm.vm-tests-tf',
+        test_name='cheets_CTS_P.9.0_r11.arm.vm-tests-tf',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'vm-tests-tf', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='vm-tests-tf',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.wm-presubmit b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.wm-presubmit
similarity index 91%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.arm.wm-presubmit
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.arm.wm-presubmit
index 508f22a..a528867 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.wm-presubmit
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.wm-presubmit
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.arm.wm-presubmit'
+NAME = 'cheets_CTS_P.9.0_r11.arm.wm-presubmit'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:smoke'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.arm.wm-presubmit',
-        test_name='cheets_CTS_P.9.0_r10.arm.wm-presubmit',
+        tag='9.0_r11.arm.wm-presubmit',
+        test_name='cheets_CTS_P.9.0_r11.arm.wm-presubmit',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsActivityManagerDeviceSdk25TestCases', '--include-filter', 'CtsActivityManagerDeviceTestCases', '--include-filter', 'CtsAppTestCases android.app.cts.TaskDescriptionTest', '--include-filter', 'CtsWindowManagerDeviceTestCases', '--test-arg', 'com.android.compatibility.common.tradefed.testtype.JarHostTest:include-annotation:android.platform.test.annotations.Presubmit', '--test-arg', 'com.android.tradefed.testtype.AndroidJUnitTest:include-annotation:android.platform.test.annotations.Presubmit', '--test-arg', 'com.android.tradefed.testtype.HostTest:include-annotation:android.platform.test.annotations.Presubmit', '--test-arg', 'com.android.tradefed.testtype.AndroidJUnitTest:exclude-annotation:androidx.test.filters.FlakyTest', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='wm-presubmit',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         timeout=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAbiOverrideHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAbiOverrideHostTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAbiOverrideHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAbiOverrideHostTestCases
index b650494..1a73461 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAbiOverrideHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAbiOverrideHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsAbiOverrideHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsAbiOverrideHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsAbiOverrideHostTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsAbiOverrideHostTestCases',
+        tag='9.0_r11.x86.CtsAbiOverrideHostTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsAbiOverrideHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAbiOverrideHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsAbiOverrideHostTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAccelerationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAccelerationTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAccelerationTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAccelerationTestCases
index a9abec8..a381a41 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAccelerationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAccelerationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsAccelerationTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsAccelerationTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsAccelerationTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsAccelerationTestCases',
+        tag='9.0_r11.x86.CtsAccelerationTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsAccelerationTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAccelerationTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsAccelerationTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAccessibility b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAccessibility
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAccessibility
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAccessibility
index d1e970a..ffe4081 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAccessibility
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAccessibility
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsAccessibility'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsAccessibility'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsAccessibility',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsAccessibility',
+        tag='9.0_r11.x86.CtsAccessibility',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsAccessibility',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAccessibilityServiceTestCases', '--include-filter', 'CtsAccessibilityTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsAccessibility',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAccountManagerTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAccountManagerTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAccountManagerTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAccountManagerTestCases
index 45bdf22..a73421f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAccountManagerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAccountManagerTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsAccountManagerTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsAccountManagerTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsAccountManagerTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsAccountManagerTestCases',
+        tag='9.0_r11.x86.CtsAccountManagerTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsAccountManagerTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAccountManagerTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsAccountManagerTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsActivityManagerDevice b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsActivityManagerDevice
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsActivityManagerDevice
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsActivityManagerDevice
index b69fd1f..6ba5dec 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsActivityManagerDevice
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsActivityManagerDevice
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsActivityManagerDevice'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsActivityManagerDevice'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsActivityManagerDevice',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsActivityManagerDevice',
+        tag='9.0_r11.x86.CtsActivityManagerDevice',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsActivityManagerDevice',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsActivityManagerDeviceSdk25TestCases', '--include-filter', 'CtsActivityManagerDeviceTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsActivityManagerDevice',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=10800)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAdmin b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAdmin
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAdmin
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAdmin
index cd63c1a..f575f35 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAdmin
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAdmin
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsAdmin'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsAdmin'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsAdmin',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsAdmin',
+        tag='9.0_r11.x86.CtsAdmin',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsAdmin',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAdminPackageInstallerTestCases', '--include-filter', 'CtsAdminTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsAdmin',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAlarm b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAlarm
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAlarm
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAlarm
index 8d9ab9d..051afea 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAlarm
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAlarm
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsAlarm'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsAlarm'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsAlarm',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsAlarm',
+        tag='9.0_r11.x86.CtsAlarm',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsAlarm',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAlarmClockTestCases', '--include-filter', 'CtsAlarmManagerTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsAlarm',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAndroid b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAndroid
similarity index 90%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAndroid
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAndroid
index 772e383..de82d9d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAndroid
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAndroid
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsAndroid'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsAndroid'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsAndroid',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsAndroid',
+        tag='9.0_r11.x86.CtsAndroid',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsAndroid',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAndroidAppTestCases', '--include-filter', 'CtsAndroidTestBase27ApiSignatureTestCases', '--include-filter', 'CtsAndroidTestMockCurrentApiSignatureTestCases', '--include-filter', 'CtsAndroidTestRunnerCurrentApiSignatureTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsAndroid',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=9000)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAnimationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAnimationTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAnimationTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAnimationTestCases
index d7e4ed6..c8f84bb 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAnimationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAnimationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsAnimationTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsAnimationTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsAnimationTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsAnimationTestCases',
+        tag='9.0_r11.x86.CtsAnimationTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsAnimationTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAnimationTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsAnimationTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsApacheHttpLegacy b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsApacheHttpLegacy
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsApacheHttpLegacy
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsApacheHttpLegacy
index 04042b9..98f44b7 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsApacheHttpLegacy
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsApacheHttpLegacy
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsApacheHttpLegacy'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsApacheHttpLegacy'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsApacheHttpLegacy',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsApacheHttpLegacy',
+        tag='9.0_r11.x86.CtsApacheHttpLegacy',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsApacheHttpLegacy',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsApacheHttpLegacy27ApiSignatureTestCases', '--include-filter', 'CtsApacheHttpLegacyCurrentApiSignatureTestCases', '--include-filter', 'CtsApacheHttpLegacyUsesLibraryApiSignatureTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsApacheHttpLegacy',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=7200)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsApp b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsApp
similarity index 91%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsApp
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsApp
index e73daae..0071b01 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsApp
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsApp
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsApp'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsApp'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         enable_default_apps=True,
-        tag='9.0_r10.x86.CtsApp',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsApp',
+        tag='9.0_r11.x86.CtsApp',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsApp',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAppComponentFactoryTestCases', '--include-filter', 'CtsAppSecurityHostTestCases', '--include-filter', 'CtsAppTestCases', '--include-filter', 'CtsAppUsageHostTestCases', '--include-filter', 'CtsAppWidgetTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsApp',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         login_precondition_commands=['lsblk -do NAME,RM | sed -n s/1$//p | xargs -n1 eject'],
         timeout=16200)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAslrMallocTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAslrMallocTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAslrMallocTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAslrMallocTestCases
index fbc954f..38bb9ec 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAslrMallocTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAslrMallocTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsAslrMallocTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsAslrMallocTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsAslrMallocTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsAslrMallocTestCases',
+        tag='9.0_r11.x86.CtsAslrMallocTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsAslrMallocTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAslrMallocTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsAslrMallocTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAssistTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAssistTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAssistTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAssistTestCases
index 2580c0a..0e1f3de 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAssistTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAssistTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsAssistTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsAssistTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsAssistTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsAssistTestCases',
+        tag='9.0_r11.x86.CtsAssistTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsAssistTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAssistTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsAssistTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAtraceHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAtraceHostTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAtraceHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAtraceHostTestCases
index 5f3dc69..1e0f2de 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAtraceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAtraceHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsAtraceHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsAtraceHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsAtraceHostTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsAtraceHostTestCases',
+        tag='9.0_r11.x86.CtsAtraceHostTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsAtraceHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAtraceHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsAtraceHostTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAutoFillServiceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAutoFillServiceTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAutoFillServiceTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAutoFillServiceTestCases
index dbee2fe..4c590c2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAutoFillServiceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsAutoFillServiceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsAutoFillServiceTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsAutoFillServiceTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsAutoFillServiceTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsAutoFillServiceTestCases',
+        tag='9.0_r11.x86.CtsAutoFillServiceTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsAutoFillServiceTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAutoFillServiceTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsAutoFillServiceTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=9000)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsBackgroundRestrictionsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsBackgroundRestrictionsTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsBackgroundRestrictionsTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsBackgroundRestrictionsTestCases
index 221c3ff..f1025ee 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsBackgroundRestrictionsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsBackgroundRestrictionsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsBackgroundRestrictionsTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsBackgroundRestrictionsTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsBackgroundRestrictionsTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsBackgroundRestrictionsTestCases',
+        tag='9.0_r11.x86.CtsBackgroundRestrictionsTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsBackgroundRestrictionsTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsBackgroundRestrictionsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsBackgroundRestrictionsTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsBackup b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsBackup
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsBackup
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsBackup
index ecbb36b..88ea797 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsBackup
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsBackup
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsBackup'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsBackup'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsBackup',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsBackup',
+        tag='9.0_r11.x86.CtsBackup',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsBackup',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsBackupHostTestCases', '--include-filter', 'CtsBackupTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsBackup',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsBatterySavingTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsBatterySavingTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsBatterySavingTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsBatterySavingTestCases
index 8232756..8f66b43 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsBatterySavingTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsBatterySavingTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsBatterySavingTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsBatterySavingTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsBatterySavingTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsBatterySavingTestCases',
+        tag='9.0_r11.x86.CtsBatterySavingTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsBatterySavingTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsBatterySavingTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsBatterySavingTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsBionicTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsBionicTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsBionicTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsBionicTestCases
index 820cba0..1f78a94 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsBionicTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsBionicTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsBionicTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsBionicTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsBionicTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsBionicTestCases',
+        tag='9.0_r11.x86.CtsBionicTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsBionicTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsBionicTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsBionicTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsBluetoothTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsBluetoothTestCases
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsBluetoothTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsBluetoothTestCases
index 29c0bd7..a5b54f6 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsBluetoothTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsBluetoothTestCases
@@ -7,7 +7,7 @@
 from autotest_lib.server import utils
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsBluetoothTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsBluetoothTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:arc-cts-unibuild-hw, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -33,14 +33,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsBluetoothTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsBluetoothTestCases',
+        tag='9.0_r11.x86.CtsBluetoothTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsBluetoothTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsBluetoothTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsBluetoothTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         hard_reboot_on_failure=True,
         timeout=3600)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsBootStatsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsBootStatsTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsBootStatsTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsBootStatsTestCases
index 2d7919d..b022be4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsBootStatsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsBootStatsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsBootStatsTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsBootStatsTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsBootStatsTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsBootStatsTestCases',
+        tag='9.0_r11.x86.CtsBootStatsTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsBootStatsTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsBootStatsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsBootStatsTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCalendarcommon2TestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCalendarcommon2TestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCalendarcommon2TestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCalendarcommon2TestCases
index bdcb6d5..7488137 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCalendarcommon2TestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCalendarcommon2TestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsCalendarcommon2TestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsCalendarcommon2TestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsCalendarcommon2TestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsCalendarcommon2TestCases',
+        tag='9.0_r11.x86.CtsCalendarcommon2TestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsCalendarcommon2TestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCalendarcommon2TestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsCalendarcommon2TestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCamera b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCamera
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCamera
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCamera
index 05897dc..0abfa12 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCamera
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCamera
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsCamera'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsCamera'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:arc-cts-unibuild-hw, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsCamera',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsCamera',
+        tag='9.0_r11.x86.CtsCamera',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsCamera',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraApi25TestCases', '--include-filter', 'CtsCameraTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsCamera',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCameraTestCases.camerabox.back b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCameraTestCases.camerabox.back
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCameraTestCases.camerabox.back
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCameraTestCases.camerabox.back
index 00fc269..9264269 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCameraTestCases.camerabox.back
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCameraTestCases.camerabox.back
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsCameraTestCases.camerabox.back'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsCameraTestCases.camerabox.back'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:arc-cts-unibuild-hw, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86, camerabox'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         cmdline_args=args,
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsCameraTestCases.camerabox.back',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsCameraTestCases.camerabox.back',
+        tag='9.0_r11.x86.CtsCameraTestCases.camerabox.back',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsCameraTestCases.camerabox.back',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCameraTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsCameraTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCameraTestCases.camerabox.front b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCameraTestCases.camerabox.front
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCameraTestCases.camerabox.front
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCameraTestCases.camerabox.front
index c1a36af..3e495a2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCameraTestCases.camerabox.front
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCameraTestCases.camerabox.front
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsCameraTestCases.camerabox.front'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsCameraTestCases.camerabox.front'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:arc-cts-unibuild-hw, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86, camerabox'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         cmdline_args=args,
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsCameraTestCases.camerabox.front',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsCameraTestCases.camerabox.front',
+        tag='9.0_r11.x86.CtsCameraTestCases.camerabox.front',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsCameraTestCases.camerabox.front',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCameraTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsCameraTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCarTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCarTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCarTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCarTestCases
index 1e9356f..db539af 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCarTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCarTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsCarTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsCarTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsCarTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsCarTestCases',
+        tag='9.0_r11.x86.CtsCarTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsCarTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCarTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsCarTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCarrierApiTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCarrierApiTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCarrierApiTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCarrierApiTestCases
index 3fd6c92..8f989d8 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCarrierApiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCarrierApiTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsCarrierApiTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsCarrierApiTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsCarrierApiTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsCarrierApiTestCases',
+        tag='9.0_r11.x86.CtsCarrierApiTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsCarrierApiTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCarrierApiTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsCarrierApiTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsColorModeTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsColorModeTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsColorModeTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsColorModeTestCases
index 9e925a3..912579b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsColorModeTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsColorModeTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsColorModeTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsColorModeTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsColorModeTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsColorModeTestCases',
+        tag='9.0_r11.x86.CtsColorModeTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsColorModeTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsColorModeTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsColorModeTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCompilationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCompilationTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCompilationTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCompilationTestCases
index 6b1bf81..53b7acd 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCompilationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCompilationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsCompilationTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsCompilationTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsCompilationTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsCompilationTestCases',
+        tag='9.0_r11.x86.CtsCompilationTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsCompilationTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCompilationTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsCompilationTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsContactsProviderWipe b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsContactsProviderWipe
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsContactsProviderWipe
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsContactsProviderWipe
index 3ff6528..b09188d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsContactsProviderWipe
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsContactsProviderWipe
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsContactsProviderWipe'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsContactsProviderWipe'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsContactsProviderWipe',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsContactsProviderWipe',
+        tag='9.0_r11.x86.CtsContactsProviderWipe',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsContactsProviderWipe',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsContactsProviderWipe', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsContactsProviderWipe',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsContentTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsContentTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsContentTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsContentTestCases
index 34e6d4c..eb7e753 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsContentTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsContentTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsContentTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsContentTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         enable_default_apps=True,
-        tag='9.0_r10.x86.CtsContentTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsContentTestCases',
+        tag='9.0_r11.x86.CtsContentTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsContentTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsContentTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsContentTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCppToolsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCppToolsTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCppToolsTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCppToolsTestCases
index 6b9bcca..e646e2d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCppToolsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCppToolsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsCppToolsTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsCppToolsTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsCppToolsTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsCppToolsTestCases',
+        tag='9.0_r11.x86.CtsCppToolsTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsCppToolsTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCppToolsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsCppToolsTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCurrentApiSignatureTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCurrentApiSignatureTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCurrentApiSignatureTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCurrentApiSignatureTestCases
index c6ecd05..d1ac138 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCurrentApiSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCurrentApiSignatureTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsCurrentApiSignatureTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsCurrentApiSignatureTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsCurrentApiSignatureTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsCurrentApiSignatureTestCases',
+        tag='9.0_r11.x86.CtsCurrentApiSignatureTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsCurrentApiSignatureTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCurrentApiSignatureTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsCurrentApiSignatureTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDatabaseTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDatabaseTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDatabaseTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDatabaseTestCases
index 0b8a235..c60c3f5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDatabaseTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDatabaseTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsDatabaseTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsDatabaseTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsDatabaseTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsDatabaseTestCases',
+        tag='9.0_r11.x86.CtsDatabaseTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsDatabaseTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDatabaseTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDatabaseTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDebugTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDebugTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDebugTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDebugTestCases
index c8f4a51..ca547c8 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDebugTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDebugTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsDebugTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsDebugTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsDebugTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsDebugTestCases',
+        tag='9.0_r11.x86.CtsDebugTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsDebugTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDebugTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDebugTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDeqpTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDeqpTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDeqpTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDeqpTestCases
index ed30276..61f0f03 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDeqpTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDeqpTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsDeqpTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsDeqpTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-deqp, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=15,
-        tag='9.0_r10.x86.CtsDeqpTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsDeqpTestCases',
+        tag='9.0_r11.x86.CtsDeqpTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsDeqpTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDeqpTestCases', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDeqpTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=72000)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDeqpTestCases.dEQP-EGL b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDeqpTestCases.dEQP-EGL
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDeqpTestCases.dEQP-EGL
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDeqpTestCases.dEQP-EGL
index f253afd..cf5705c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDeqpTestCases.dEQP-EGL
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDeqpTestCases.dEQP-EGL
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsDeqpTestCases.dEQP-EGL'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsDeqpTestCases.dEQP-EGL'
 ATTRIBUTES = 'suite:arc-cts-deqp, suite:graphics_per-day'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 0
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsDeqpTestCases.dEQP-EGL',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsDeqpTestCases.dEQP-EGL',
+        tag='9.0_r11.x86.CtsDeqpTestCases.dEQP-EGL',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsDeqpTestCases.dEQP-EGL',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-EGL.*', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDeqpTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=7200)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDeqpTestCases.dEQP-GLES2 b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDeqpTestCases.dEQP-GLES2
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDeqpTestCases.dEQP-GLES2
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDeqpTestCases.dEQP-GLES2
index c628a88..dab5892 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDeqpTestCases.dEQP-GLES2
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDeqpTestCases.dEQP-GLES2
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsDeqpTestCases.dEQP-GLES2'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsDeqpTestCases.dEQP-GLES2'
 ATTRIBUTES = 'suite:arc-cts-deqp, suite:graphics_per-day'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 0
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsDeqpTestCases.dEQP-GLES2',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsDeqpTestCases.dEQP-GLES2',
+        tag='9.0_r11.x86.CtsDeqpTestCases.dEQP-GLES2',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsDeqpTestCases.dEQP-GLES2',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES2.*', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDeqpTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=7200)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDeqpTestCases.dEQP-GLES3 b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDeqpTestCases.dEQP-GLES3
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDeqpTestCases.dEQP-GLES3
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDeqpTestCases.dEQP-GLES3
index cb618d5..3884373 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDeqpTestCases.dEQP-GLES3
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDeqpTestCases.dEQP-GLES3
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsDeqpTestCases.dEQP-GLES3'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsDeqpTestCases.dEQP-GLES3'
 ATTRIBUTES = 'suite:arc-cts-deqp, suite:graphics_per-day'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 0
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsDeqpTestCases.dEQP-GLES3',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsDeqpTestCases.dEQP-GLES3',
+        tag='9.0_r11.x86.CtsDeqpTestCases.dEQP-GLES3',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsDeqpTestCases.dEQP-GLES3',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES3.*', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDeqpTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=21600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDeqpTestCases.dEQP-GLES31 b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDeqpTestCases.dEQP-GLES31
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDeqpTestCases.dEQP-GLES31
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDeqpTestCases.dEQP-GLES31
index 7f2b8dd..7c10bff 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDeqpTestCases.dEQP-GLES31
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDeqpTestCases.dEQP-GLES31
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsDeqpTestCases.dEQP-GLES31'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsDeqpTestCases.dEQP-GLES31'
 ATTRIBUTES = 'suite:arc-cts-deqp, suite:graphics_per-day'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 0
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsDeqpTestCases.dEQP-GLES31',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsDeqpTestCases.dEQP-GLES31',
+        tag='9.0_r11.x86.CtsDeqpTestCases.dEQP-GLES31',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsDeqpTestCases.dEQP-GLES31',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES31.*', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDeqpTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=21600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDeqpTestCases.dEQP-VK b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDeqpTestCases.dEQP-VK
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDeqpTestCases.dEQP-VK
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDeqpTestCases.dEQP-VK
index 3655501..862d90d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDeqpTestCases.dEQP-VK
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDeqpTestCases.dEQP-VK
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsDeqpTestCases.dEQP-VK'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsDeqpTestCases.dEQP-VK'
 ATTRIBUTES = 'suite:arc-cts-deqp, suite:graphics_per-day'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 0
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsDeqpTestCases.dEQP-VK',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsDeqpTestCases.dEQP-VK',
+        tag='9.0_r11.x86.CtsDeqpTestCases.dEQP-VK',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsDeqpTestCases.dEQP-VK',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-VK.*', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDeqpTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=54000)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDevice b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDevice
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDevice
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDevice
index 472093d..9633294 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDevice
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDevice
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsDevice'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsDevice'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsDevice',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsDevice',
+        tag='9.0_r11.x86.CtsDevice',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsDevice',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeviceIdleHostTestCases', '--include-filter', 'CtsDevicePolicyManagerTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDevice',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDexMetadataHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDexMetadataHostTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDexMetadataHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDexMetadataHostTestCases
index 305e577..fb9fc5c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDexMetadataHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDexMetadataHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsDexMetadataHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsDexMetadataHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsDexMetadataHostTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsDexMetadataHostTestCases',
+        tag='9.0_r11.x86.CtsDexMetadataHostTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsDexMetadataHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDexMetadataHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDexMetadataHostTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDisplayTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDisplayTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDisplayTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDisplayTestCases
index 817ff85..3ee47ba 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDisplayTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDisplayTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsDisplayTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsDisplayTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsDisplayTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsDisplayTestCases',
+        tag='9.0_r11.x86.CtsDisplayTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsDisplayTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDisplayTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDisplayTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDpi b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDpi
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDpi
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDpi
index 6a79e77..7c67617 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDpi
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDpi
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsDpi'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsDpi'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsDpi',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsDpi',
+        tag='9.0_r11.x86.CtsDpi',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsDpi',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDpiTestCases', '--include-filter', 'CtsDpiTestCases2', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDpi',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDreamsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDreamsTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDreamsTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDreamsTestCases
index b3e19cd..a118dd9 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDreamsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDreamsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsDreamsTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsDreamsTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsDreamsTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsDreamsTestCases',
+        tag='9.0_r11.x86.CtsDreamsTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsDreamsTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDreamsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDreamsTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDrmTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDrmTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDrmTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDrmTestCases
index 3edd4c6..c9ac454 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDrmTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDrmTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsDrmTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsDrmTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsDrmTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsDrmTestCases',
+        tag='9.0_r11.x86.CtsDrmTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsDrmTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDrmTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDrmTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDumpsysHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDumpsysHostTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDumpsysHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDumpsysHostTestCases
index d27d3b8..98a8167 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDumpsysHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDumpsysHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsDumpsysHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsDumpsysHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsDumpsysHostTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsDumpsysHostTestCases',
+        tag='9.0_r11.x86.CtsDumpsysHostTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsDumpsysHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDumpsysHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDumpsysHostTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDynamicLinkerTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDynamicLinkerTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDynamicLinkerTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDynamicLinkerTestCases
index 9d77e4c..9f81c9a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDynamicLinkerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsDynamicLinkerTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsDynamicLinkerTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsDynamicLinkerTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsDynamicLinkerTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsDynamicLinkerTestCases',
+        tag='9.0_r11.x86.CtsDynamicLinkerTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsDynamicLinkerTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDynamicLinkerTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsDynamicLinkerTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsEdiHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsEdiHostTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsEdiHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsEdiHostTestCases
index c6a9e94..a5e7cf1 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsEdiHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsEdiHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsEdiHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsEdiHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsEdiHostTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsEdiHostTestCases',
+        tag='9.0_r11.x86.CtsEdiHostTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsEdiHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsEdiHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsEdiHostTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsEffectTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsEffectTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsEffectTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsEffectTestCases
index 9de6fba..baa3156 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsEffectTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsEffectTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsEffectTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsEffectTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsEffectTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsEffectTestCases',
+        tag='9.0_r11.x86.CtsEffectTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsEffectTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsEffectTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsEffectTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsExternalS b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsExternalS
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsExternalS
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsExternalS
index c41ca24..f5f73b3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsExternalS
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsExternalS
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsExternalS'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsExternalS'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsExternalS',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsExternalS',
+        tag='9.0_r11.x86.CtsExternalS',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsExternalS',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsExternalServiceTestCases', '--include-filter', 'CtsExternalSourcesTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsExternalS',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsFileSystemTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsFileSystemTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsFileSystemTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsFileSystemTestCases
index f93b50d..9b0c626 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsFileSystemTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsFileSystemTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsFileSystemTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsFileSystemTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsFileSystemTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsFileSystemTestCases',
+        tag='9.0_r11.x86.CtsFileSystemTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsFileSystemTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsFileSystemTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsFileSystemTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=10800)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsFragment b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsFragment
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsFragment
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsFragment
index 8ca2818..f4ec07a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsFragment
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsFragment
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsFragment'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsFragment'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsFragment',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsFragment',
+        tag='9.0_r11.x86.CtsFragment',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsFragment',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsFragmentTestCases', '--include-filter', 'CtsFragmentTestCasesSdk26', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsFragment',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsGestureTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsGestureTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsGestureTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsGestureTestCases
index fcb50fe..825e26f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsGestureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsGestureTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsGestureTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsGestureTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsGestureTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsGestureTestCases',
+        tag='9.0_r11.x86.CtsGestureTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsGestureTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsGestureTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsGestureTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsGpuToolsHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsGpuToolsHostTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsGpuToolsHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsGpuToolsHostTestCases
index b028274..dbc103a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsGpuToolsHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsGpuToolsHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsGpuToolsHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsGpuToolsHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsGpuToolsHostTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsGpuToolsHostTestCases',
+        tag='9.0_r11.x86.CtsGpuToolsHostTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsGpuToolsHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsGpuToolsHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsGpuToolsHostTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsGraphicsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsGraphicsTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsGraphicsTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsGraphicsTestCases
index d7081d4..142d611 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsGraphicsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsGraphicsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsGraphicsTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsGraphicsTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsGraphicsTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsGraphicsTestCases',
+        tag='9.0_r11.x86.CtsGraphicsTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsGraphicsTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsGraphicsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsGraphicsTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsHardwareTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsHardwareTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsHardwareTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsHardwareTestCases
index 53f839c..f95c478 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsHardwareTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsHardwareTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsHardwareTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsHardwareTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational3'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsHardwareTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsHardwareTestCases',
+        tag='9.0_r11.x86.CtsHardwareTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsHardwareTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsHardwareTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsHardwareTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsHarmfulAppWarningHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsHarmfulAppWarningHostTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsHarmfulAppWarningHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsHarmfulAppWarningHostTestCases
index 11f8920..a9947bd 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsHarmfulAppWarningHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsHarmfulAppWarningHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsHarmfulAppWarningHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsHarmfulAppWarningHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsHarmfulAppWarningHostTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsHarmfulAppWarningHostTestCases',
+        tag='9.0_r11.x86.CtsHarmfulAppWarningHostTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsHarmfulAppWarningHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsHarmfulAppWarningHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsHarmfulAppWarningHostTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsHiddenApi b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsHiddenApi
similarity index 90%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsHiddenApi
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsHiddenApi
index 31b0342..0eb22c4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsHiddenApi
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsHiddenApi
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsHiddenApi'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsHiddenApi'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsHiddenApi',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsHiddenApi',
+        tag='9.0_r11.x86.CtsHiddenApi',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsHiddenApi',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHiddenApiBlacklistApi27TestCases', '--include-filter', 'CtsHiddenApiBlacklistCurrentApiTestCases', '--include-filter', 'CtsHiddenApiBlacklistDebugClassTestCases', '--include-filter', 'CtsHiddenApiKillswitchDebugClassTestCases', '--include-filter', 'CtsHiddenApiKillswitchWhitelistTestCases', '--include-filter', 'CtsHiddenApiKillswitchWildcardTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsHiddenApi',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=12600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsHostTzDataTests b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsHostTzDataTests
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsHostTzDataTests
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsHostTzDataTests
index 79d999f..741b69a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsHostTzDataTests
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsHostTzDataTests
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsHostTzDataTests'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsHostTzDataTests'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsHostTzDataTests',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsHostTzDataTests',
+        tag='9.0_r11.x86.CtsHostTzDataTests',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsHostTzDataTests',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsHostTzDataTests', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsHostTzDataTests',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsHostside b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsHostside
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsHostside
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsHostside
index 2d6ca6e..a150064 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsHostside
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsHostside
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsHostside'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsHostside'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsHostside',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsHostside',
+        tag='9.0_r11.x86.CtsHostside',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsHostside',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHostsideNetworkTests', '--include-filter', 'CtsHostsideNumberBlockingTestCases', '--include-filter', 'CtsHostsideTvTests', '--include-filter', 'CtsHostsideWebViewTests', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsHostside',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=9000)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsIcuTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsIcuTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsIcuTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsIcuTestCases
index f3ab450..fe4059c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsIcuTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsIcuTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsIcuTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsIcuTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsIcuTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsIcuTestCases',
+        tag='9.0_r11.x86.CtsIcuTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsIcuTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsIcuTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsIcuTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=7200)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsIncidentHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsIncidentHostTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsIncidentHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsIncidentHostTestCases
index 5cc3385..3d9a2d1 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsIncidentHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsIncidentHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsIncidentHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsIncidentHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=30,
-        tag='9.0_r10.x86.CtsIncidentHostTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsIncidentHostTestCases',
+        tag='9.0_r11.x86.CtsIncidentHostTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsIncidentHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsIncidentHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsIncidentHostTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsInlineMockingTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsInlineMockingTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsInlineMockingTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsInlineMockingTestCases
index e31bbaa..34bf3df 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsInlineMockingTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsInlineMockingTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsInlineMockingTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsInlineMockingTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsInlineMockingTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsInlineMockingTestCases',
+        tag='9.0_r11.x86.CtsInlineMockingTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsInlineMockingTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsInlineMockingTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsInlineMockingTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsInputMethod b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsInputMethod
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsInputMethod
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsInputMethod
index 99e5c4a..0c8710e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsInputMethod
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsInputMethod
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsInputMethod'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsInputMethod'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsInputMethod',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsInputMethod',
+        tag='9.0_r11.x86.CtsInputMethod',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsInputMethod',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsInputMethodServiceHostTestCases', '--include-filter', 'CtsInputMethodTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsInputMethod',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsIntentSignatureTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsIntentSignatureTestCases
similarity index 84%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsIntentSignatureTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsIntentSignatureTestCases
index ef57b53..98053c5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsIntentSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsIntentSignatureTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsIntentSignatureTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsIntentSignatureTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsIntentSignatureTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsIntentSignatureTestCases',
+        tag='9.0_r11.x86.CtsIntentSignatureTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsIntentSignatureTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsIntentSignatureTestCases', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='CtsIntentSignatureTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsJankDeviceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsJankDeviceTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsJankDeviceTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsJankDeviceTestCases
index 3f7b8b7..6ae8ac4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsJankDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsJankDeviceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsJankDeviceTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsJankDeviceTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsJankDeviceTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsJankDeviceTestCases',
+        tag='9.0_r11.x86.CtsJankDeviceTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsJankDeviceTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsJankDeviceTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsJankDeviceTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsJdwp b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsJdwp
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsJdwp
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsJdwp
index 73e3ade..dcbde2b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsJdwp
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsJdwp
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsJdwp'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsJdwp'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsJdwp',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsJdwp',
+        tag='9.0_r11.x86.CtsJdwp',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsJdwp',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJdwpSecurityHostTestCases', '--include-filter', 'CtsJdwpTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsJdwp',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsJniTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsJniTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsJniTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsJniTestCases
index f7daccd..21b5780 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsJniTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsJniTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsJniTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsJniTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsJniTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsJniTestCases',
+        tag='9.0_r11.x86.CtsJniTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsJniTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsJniTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsJniTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsJobScheduler b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsJobScheduler
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsJobScheduler
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsJobScheduler
index acc90ca..726852d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsJobScheduler
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsJobScheduler
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsJobScheduler'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsJobScheduler'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsJobScheduler',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsJobScheduler',
+        tag='9.0_r11.x86.CtsJobScheduler',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsJobScheduler',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJobSchedulerSharedUidTestCases', '--include-filter', 'CtsJobSchedulerTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsJobScheduler',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         login_precondition_commands=['lsblk -do NAME,RM | sed -n s/1$//p | xargs -n1 eject'],
         timeout=5400)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsJvmti b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsJvmti
similarity index 97%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsJvmti
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsJvmti
index 32831b8..a24afa4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsJvmti
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsJvmti
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsJvmti'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsJvmti'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsJvmti',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsJvmti',
+        tag='9.0_r11.x86.CtsJvmti',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsJvmti',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiAttachingHostTestCases', '--include-filter', 'CtsJvmtiAttachingTestCases', '--include-filter', 'CtsJvmtiRedefineClassesHostTestCases', '--include-filter', 'CtsJvmtiRunTest1900HostTestCases', '--include-filter', 'CtsJvmtiRunTest1901HostTestCases', '--include-filter', 'CtsJvmtiRunTest1902HostTestCases', '--include-filter', 'CtsJvmtiRunTest1903HostTestCases', '--include-filter', 'CtsJvmtiRunTest1904HostTestCases', '--include-filter', 'CtsJvmtiRunTest1906HostTestCases', '--include-filter', 'CtsJvmtiRunTest1907HostTestCases', '--include-filter', 'CtsJvmtiRunTest1908HostTestCases', '--include-filter', 'CtsJvmtiRunTest1909HostTestCases', '--include-filter', 'CtsJvmtiRunTest1910HostTestCases', '--include-filter', 'CtsJvmtiRunTest1911HostTestCases', '--include-filter', 'CtsJvmtiRunTest1912HostTestCases', '--include-filter', 'CtsJvmtiRunTest1913HostTestCases', '--include-filter', 'CtsJvmtiRunTest1914HostTestCases', '--include-filter', 'CtsJvmtiRunTest1915HostTestCases', '--include-filter', 'CtsJvmtiRunTest1916HostTestCases', '--include-filter', 'CtsJvmtiRunTest1917HostTestCases', '--include-filter', 'CtsJvmtiRunTest1920HostTestCases', '--include-filter', 'CtsJvmtiRunTest1921HostTestCases', '--include-filter', 'CtsJvmtiRunTest1922HostTestCases', '--include-filter', 'CtsJvmtiRunTest1923HostTestCases', '--include-filter', 'CtsJvmtiRunTest1924HostTestCases', '--include-filter', 'CtsJvmtiRunTest1925HostTestCases', '--include-filter', 'CtsJvmtiRunTest1926HostTestCases', '--include-filter', 'CtsJvmtiRunTest1927HostTestCases', '--include-filter', 'CtsJvmtiRunTest1928HostTestCases', '--include-filter', 'CtsJvmtiRunTest1930HostTestCases', '--include-filter', 'CtsJvmtiRunTest1931HostTestCases', '--include-filter', 'CtsJvmtiRunTest1932HostTestCases', '--include-filter', 'CtsJvmtiRunTest1933HostTestCases', '--include-filter', 'CtsJvmtiRunTest1934HostTestCases', '--include-filter', 'CtsJvmtiRunTest1936HostTestCases', '--include-filter', 'CtsJvmtiRunTest1937HostTestCases', '--include-filter', 'CtsJvmtiRunTest1939HostTestCases', '--include-filter', 'CtsJvmtiRunTest1941HostTestCases', '--include-filter', 'CtsJvmtiRunTest1942HostTestCases', '--include-filter', 'CtsJvmtiRunTest1943HostTestCases', '--include-filter', 'CtsJvmtiRunTest902HostTestCases', '--include-filter', 'CtsJvmtiRunTest903HostTestCases', '--include-filter', 'CtsJvmtiRunTest904HostTestCases', '--include-filter', 'CtsJvmtiRunTest905HostTestCases', '--include-filter', 'CtsJvmtiRunTest906HostTestCases', '--include-filter', 'CtsJvmtiRunTest907HostTestCases', '--include-filter', 'CtsJvmtiRunTest908HostTestCases', '--include-filter', 'CtsJvmtiRunTest910HostTestCases', '--include-filter', 'CtsJvmtiRunTest911HostTestCases', '--include-filter', 'CtsJvmtiRunTest912HostTestCases', '--include-filter', 'CtsJvmtiRunTest913HostTestCases', '--include-filter', 'CtsJvmtiRunTest914HostTestCases', '--include-filter', 'CtsJvmtiRunTest915HostTestCases', '--include-filter', 'CtsJvmtiRunTest917HostTestCases', '--include-filter', 'CtsJvmtiRunTest918HostTestCases', '--include-filter', 'CtsJvmtiRunTest919HostTestCases', '--include-filter', 'CtsJvmtiRunTest920HostTestCases', '--include-filter', 'CtsJvmtiRunTest922HostTestCases', '--include-filter', 'CtsJvmtiRunTest923HostTestCases', '--include-filter', 'CtsJvmtiRunTest924HostTestCases', '--include-filter', 'CtsJvmtiRunTest926HostTestCases', '--include-filter', 'CtsJvmtiRunTest927HostTestCases', '--include-filter', 'CtsJvmtiRunTest928HostTestCases', '--include-filter', 'CtsJvmtiRunTest930HostTestCases', '--include-filter', 'CtsJvmtiRunTest931HostTestCases', '--include-filter', 'CtsJvmtiRunTest932HostTestCases', '--include-filter', 'CtsJvmtiRunTest940HostTestCases', '--include-filter', 'CtsJvmtiRunTest942HostTestCases', '--include-filter', 'CtsJvmtiRunTest944HostTestCases', '--include-filter', 'CtsJvmtiRunTest945HostTestCases', '--include-filter', 'CtsJvmtiRunTest947HostTestCases', '--include-filter', 'CtsJvmtiRunTest951HostTestCases', '--include-filter', 'CtsJvmtiRunTest982HostTestCases', '--include-filter', 'CtsJvmtiRunTest983HostTestCases', '--include-filter', 'CtsJvmtiRunTest984HostTestCases', '--include-filter', 'CtsJvmtiRunTest985HostTestCases', '--include-filter', 'CtsJvmtiRunTest986HostTestCases', '--include-filter', 'CtsJvmtiRunTest988HostTestCases', '--include-filter', 'CtsJvmtiRunTest989HostTestCases', '--include-filter', 'CtsJvmtiRunTest990HostTestCases', '--include-filter', 'CtsJvmtiRunTest991HostTestCases', '--include-filter', 'CtsJvmtiRunTest992HostTestCases', '--include-filter', 'CtsJvmtiRunTest993HostTestCases', '--include-filter', 'CtsJvmtiRunTest994HostTestCases', '--include-filter', 'CtsJvmtiRunTest995HostTestCases', '--include-filter', 'CtsJvmtiRunTest996HostTestCases', '--include-filter', 'CtsJvmtiRunTest997HostTestCases', '--include-filter', 'CtsJvmtiTaggingHostTestCases', '--include-filter', 'CtsJvmtiTrackingHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsJvmti',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=26700)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsKernelConfigTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsKernelConfigTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsKernelConfigTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsKernelConfigTestCases
index e87a9bc..82b06d3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsKernelConfigTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsKernelConfigTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsKernelConfigTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsKernelConfigTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsKernelConfigTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsKernelConfigTestCases',
+        tag='9.0_r11.x86.CtsKernelConfigTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsKernelConfigTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsKernelConfigTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsKernelConfigTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsKeystoreTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsKeystoreTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsKeystoreTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsKeystoreTestCases
index bf72c20..71b53c6 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsKeystoreTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsKeystoreTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsKeystoreTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsKeystoreTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsKeystoreTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsKeystoreTestCases',
+        tag='9.0_r11.x86.CtsKeystoreTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsKeystoreTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsKeystoreTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsKeystoreTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsLeanbackJankTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsLeanbackJankTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsLeanbackJankTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsLeanbackJankTestCases
index bd542fa..aa25bd9 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsLeanbackJankTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsLeanbackJankTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsLeanbackJankTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsLeanbackJankTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsLeanbackJankTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsLeanbackJankTestCases',
+        tag='9.0_r11.x86.CtsLeanbackJankTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsLeanbackJankTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsLeanbackJankTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsLeanbackJankTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsLegacyNotificationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsLegacyNotificationTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsLegacyNotificationTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsLegacyNotificationTestCases
index 4544c8e..733ed14 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsLegacyNotificationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsLegacyNotificationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsLegacyNotificationTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsLegacyNotificationTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsLegacyNotificationTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsLegacyNotificationTestCases',
+        tag='9.0_r11.x86.CtsLegacyNotificationTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsLegacyNotificationTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsLegacyNotificationTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsLegacyNotificationTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsLibcore b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsLibcore
similarity index 91%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsLibcore
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsLibcore
index f640bbc..9524848 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsLibcore
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsLibcore
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsLibcore'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsLibcore'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1, suite:vmtest-informational3'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsLibcore',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsLibcore',
+        tag='9.0_r11.x86.CtsLibcore',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsLibcore',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLibcoreFileIOTestCases', '--include-filter', 'CtsLibcoreJsr166TestCases', '--include-filter', 'CtsLibcoreLegacy22TestCases', '--include-filter', 'CtsLibcoreOjTestCases', '--include-filter', 'CtsLibcoreOkHttpTestCases', '--include-filter', 'CtsLibcoreTestCases', '--include-filter', 'CtsLibcoreWycheproofBCTestCases', '--include-filter', 'CtsLibcoreWycheproofConscryptTestCases', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsLibcore',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=21600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsLiblogTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsLiblogTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsLiblogTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsLiblogTestCases
index 5e1d8f9..06472d2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsLiblogTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsLiblogTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsLiblogTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsLiblogTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsLiblogTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsLiblogTestCases',
+        tag='9.0_r11.x86.CtsLiblogTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsLiblogTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsLiblogTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsLiblogTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsLocation b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsLocation
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsLocation
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsLocation
index 1c8b060..093a158 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsLocation
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsLocation
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsLocation'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsLocation'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsLocation',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsLocation',
+        tag='9.0_r11.x86.CtsLocation',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsLocation',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLocation2TestCases', '--include-filter', 'CtsLocationTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsLocation',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsLogdTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsLogdTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsLogdTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsLogdTestCases
index c98df1e..8874373 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsLogdTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsLogdTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsLogdTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsLogdTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsLogdTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsLogdTestCases',
+        tag='9.0_r11.x86.CtsLogdTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsLogdTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsLogdTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsLogdTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsMediaBitstreamsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsMediaBitstreamsTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsMediaBitstreamsTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsMediaBitstreamsTestCases
index 14050a4..55acd93 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsMediaBitstreamsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsMediaBitstreamsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsMediaBitstreamsTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsMediaBitstreamsTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=True,
-        tag='9.0_r10.x86.CtsMediaBitstreamsTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsMediaBitstreamsTestCases',
+        tag='9.0_r11.x86.CtsMediaBitstreamsTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsMediaBitstreamsTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaBitstreamsTestCases', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='CtsMediaBitstreamsTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsMediaHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsMediaHostTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsMediaHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsMediaHostTestCases
index 9739ed0..be2fc2f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsMediaHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsMediaHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsMediaHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsMediaHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsMediaHostTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsMediaHostTestCases',
+        tag='9.0_r11.x86.CtsMediaHostTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsMediaHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsMediaHostTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsMediaStressTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsMediaStressTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsMediaStressTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsMediaStressTestCases
index 471ae48..f96e894 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsMediaStressTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsMediaStressTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsMediaStressTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsMediaStressTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational2'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=True,
-        tag='9.0_r10.x86.CtsMediaStressTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsMediaStressTestCases',
+        tag='9.0_r11.x86.CtsMediaStressTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsMediaStressTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaStressTestCases', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='CtsMediaStressTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=18000)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsMediaTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsMediaTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsMediaTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsMediaTestCases
index dc63298..a97868c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsMediaTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsMediaTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsMediaTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsMediaTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational2'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=True,
-        tag='9.0_r10.x86.CtsMediaTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsMediaTestCases',
+        tag='9.0_r11.x86.CtsMediaTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsMediaTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaTestCases', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='CtsMediaTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         login_precondition_commands=['lsblk -do NAME,RM | sed -n s/1$//p | xargs -n1 eject'],
         timeout=36000)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsMidiTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsMidiTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsMidiTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsMidiTestCases
index 9ee303a..52857bc 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsMidiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsMidiTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsMidiTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsMidiTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsMidiTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsMidiTestCases',
+        tag='9.0_r11.x86.CtsMidiTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsMidiTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMidiTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsMidiTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsMocking b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsMocking
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsMocking
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsMocking
index 730ea51..a4c036e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsMocking
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsMocking
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsMocking'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsMocking'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsMocking',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsMocking',
+        tag='9.0_r11.x86.CtsMocking',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsMocking',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMockingDebuggableTestCases', '--include-filter', 'CtsMockingTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsMocking',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsMonkeyTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsMonkeyTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsMonkeyTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsMonkeyTestCases
index 35a6f82..1d0dfff 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsMonkeyTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsMonkeyTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsMonkeyTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsMonkeyTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsMonkeyTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsMonkeyTestCases',
+        tag='9.0_r11.x86.CtsMonkeyTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsMonkeyTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMonkeyTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsMonkeyTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsMultiUser b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsMultiUser
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsMultiUser
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsMultiUser
index 9c4ef06..949d723 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsMultiUser
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsMultiUser
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsMultiUser'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsMultiUser'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsMultiUser',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsMultiUser',
+        tag='9.0_r11.x86.CtsMultiUser',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsMultiUser',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMultiUserHostTestCases', '--include-filter', 'CtsMultiUserTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsMultiUser',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsNNAPITestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsNNAPITestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsNNAPITestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsNNAPITestCases
index a11c29b..de30d64 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsNNAPITestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsNNAPITestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsNNAPITestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsNNAPITestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsNNAPITestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsNNAPITestCases',
+        tag='9.0_r11.x86.CtsNNAPITestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsNNAPITestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsNNAPITestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsNNAPITestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsNative b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsNative
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsNative
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsNative
index 5056252..c922bd6 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsNative
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsNative
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsNative'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsNative'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsNative',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsNative',
+        tag='9.0_r11.x86.CtsNative',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsNative',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNativeHardwareTestCases', '--include-filter', 'CtsNativeMediaAAudioTestCases', '--include-filter', 'CtsNativeMediaSlTestCases', '--include-filter', 'CtsNativeMediaXaTestCases', '--include-filter', 'CtsNativeNetTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsNative',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=10800)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsNdefTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsNdefTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsNdefTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsNdefTestCases
index c77d6a2..5baa51d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsNdefTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsNdefTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsNdefTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsNdefTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsNdefTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsNdefTestCases',
+        tag='9.0_r11.x86.CtsNdefTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsNdefTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsNdefTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsNdefTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsNet b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsNet
similarity index 94%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsNet
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsNet
index b0880fa..b772bad 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsNet
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsNet
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsNet'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsNet'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsNet',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsNet',
+        tag='9.0_r11.x86.CtsNet',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsNet',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecConfigAttributeTestCases', '--include-filter', 'CtsNetSecConfigBasicDebugDisabledTestCases', '--include-filter', 'CtsNetSecConfigBasicDebugEnabledTestCases', '--include-filter', 'CtsNetSecConfigBasicDomainConfigTestCases', '--include-filter', 'CtsNetSecConfigCleartextTrafficTestCases', '--include-filter', 'CtsNetSecConfigDownloadManagerTestCases', '--include-filter', 'CtsNetSecConfigInvalidPinTestCases', '--include-filter', 'CtsNetSecConfigNestedDomainConfigTestCases', '--include-filter', 'CtsNetSecConfigPrePCleartextTrafficTestCases', '--include-filter', 'CtsNetSecConfigResourcesSrcTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficFalseTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficTrueTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases', '--include-filter', 'CtsNetTestCases', '--include-filter', 'CtsNetTestCasesLegacyApi22', '--include-filter', 'CtsNetTestCasesLegacyPermission22', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsNet',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=30600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsOmapiTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsOmapiTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsOmapiTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsOmapiTestCases
index d00e9ea..4d512b8 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsOmapiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsOmapiTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsOmapiTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsOmapiTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsOmapiTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsOmapiTestCases',
+        tag='9.0_r11.x86.CtsOmapiTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsOmapiTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsOmapiTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsOmapiTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsOpenG b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsOpenG
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsOpenG
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsOpenG
index 06c015e..6f9b670 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsOpenG
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsOpenG
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsOpenG'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsOpenG'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsOpenG',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsOpenG',
+        tag='9.0_r11.x86.CtsOpenG',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsOpenG',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsOpenGLTestCases', '--include-filter', 'CtsOpenGlPerf2TestCases', '--include-filter', 'CtsOpenGlPerfTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsOpenG',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=7200)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsOs b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsOs
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsOs
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsOs
index fd17cf2..5a7cf77 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsOs
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsOs
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsOs'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsOs'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsOs',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsOs',
+        tag='9.0_r11.x86.CtsOs',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsOs',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsOsHostTestCases', '--include-filter', 'CtsOsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsOs',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         login_precondition_commands=['lsblk -do NAME,RM | sed -n s/1$//p | xargs -n1 eject'],
         timeout=5400)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsPdfTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsPdfTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsPdfTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsPdfTestCases
index 8a4a6de..77e7740 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsPdfTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsPdfTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsPdfTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsPdfTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsPdfTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsPdfTestCases',
+        tag='9.0_r11.x86.CtsPdfTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsPdfTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsPdfTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsPdfTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsPerfettoTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsPerfettoTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsPerfettoTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsPerfettoTestCases
index 971a2d8..c627aa1 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsPerfettoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsPerfettoTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsPerfettoTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsPerfettoTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsPerfettoTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsPerfettoTestCases',
+        tag='9.0_r11.x86.CtsPerfettoTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsPerfettoTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsPerfettoTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsPerfettoTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsPermission b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsPermission
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsPermission
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsPermission
index c9a22d2..2afd53e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsPermission
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsPermission
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsPermission'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsPermission'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsPermission',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsPermission',
+        tag='9.0_r11.x86.CtsPermission',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsPermission',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPermission2TestCases', '--include-filter', 'CtsPermissionTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsPermission',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsPreference b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsPreference
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsPreference
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsPreference
index 5b02d99..6d6a8ea 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsPreference
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsPreference
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsPreference'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsPreference'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsPreference',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsPreference',
+        tag='9.0_r11.x86.CtsPreference',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsPreference',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPreference2TestCases', '--include-filter', 'CtsPreferenceTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsPreference',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsPrintTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsPrintTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsPrintTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsPrintTestCases
index 4b2e8cc..2f69a82 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsPrintTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsPrintTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsPrintTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsPrintTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsPrintTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsPrintTestCases',
+        tag='9.0_r11.x86.CtsPrintTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsPrintTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsPrintTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsPrintTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsProtoTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsProtoTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsProtoTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsProtoTestCases
index 68474dc..ce57cc1 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsProtoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsProtoTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsProtoTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsProtoTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsProtoTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsProtoTestCases',
+        tag='9.0_r11.x86.CtsProtoTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsProtoTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsProtoTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsProtoTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsProviderTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsProviderTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsProviderTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsProviderTestCases
index 38e97b4..5139cd3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsProviderTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsProviderTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsProviderTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsProviderTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsProviderTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsProviderTestCases',
+        tag='9.0_r11.x86.CtsProviderTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsProviderTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsProviderTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsProviderTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         login_precondition_commands=['lsblk -do NAME,RM | sed -n s/1$//p | xargs -n1 eject'],
         timeout=3600)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsRenderscript b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsRenderscript
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsRenderscript
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsRenderscript
index 8827f24..da9abdb 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsRenderscript
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsRenderscript
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsRenderscript'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsRenderscript'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsRenderscript',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsRenderscript',
+        tag='9.0_r11.x86.CtsRenderscript',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsRenderscript',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsRenderscriptLegacyTestCases', '--include-filter', 'CtsRenderscriptTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsRenderscript',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsRs b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsRs
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsRs
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsRs
index 65dd1b0..33948a3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsRs
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsRs
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsRs'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsRs'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsRs',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsRs',
+        tag='9.0_r11.x86.CtsRs',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsRs',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsRsBlasTestCases', '--include-filter', 'CtsRsCppTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsRs',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSample b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSample
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSample
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSample
index 5e699b6..1cb4236 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSample
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSample
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsSample'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsSample'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsSample',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsSample',
+        tag='9.0_r11.x86.CtsSample',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsSample',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSampleDeviceTestCases', '--include-filter', 'CtsSampleHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSample',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSaxTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSaxTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSaxTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSaxTestCases
index 40a29ae..dfd7bdd 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSaxTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSaxTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsSaxTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsSaxTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsSaxTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsSaxTestCases',
+        tag='9.0_r11.x86.CtsSaxTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsSaxTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSaxTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSaxTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSeccompHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSeccompHostTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSeccompHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSeccompHostTestCases
index 5fa2065..e108e12 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSeccompHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSeccompHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsSeccompHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsSeccompHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsSeccompHostTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsSeccompHostTestCases',
+        tag='9.0_r11.x86.CtsSeccompHostTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsSeccompHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSeccompHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSeccompHostTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSecureElementAccessControl b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSecureElementAccessControl
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSecureElementAccessControl
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSecureElementAccessControl
index 75aa5a6..43146f8 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSecureElementAccessControl
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSecureElementAccessControl
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsSecureElementAccessControl'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsSecureElementAccessControl'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsSecureElementAccessControl',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsSecureElementAccessControl',
+        tag='9.0_r11.x86.CtsSecureElementAccessControl',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsSecureElementAccessControl',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecureElementAccessControlTestCases1', '--include-filter', 'CtsSecureElementAccessControlTestCases2', '--include-filter', 'CtsSecureElementAccessControlTestCases3', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSecureElementAccessControl',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=7200)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSecurity b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSecurity
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSecurity
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSecurity
index 52ca8fd..2155d55 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSecurity
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSecurity
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsSecurity'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsSecurity'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsSecurity',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsSecurity',
+        tag='9.0_r11.x86.CtsSecurity',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsSecurity',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecurityBulletinHostTestCases', '--include-filter', 'CtsSecurityHostTestCases', '--include-filter', 'CtsSecurityTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSecurity',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         precondition_commands=['echo 3 > /proc/sys/kernel/perf_event_paranoid', 'modprobe configs'],
         timeout=12600)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSelinuxTargetSdk b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSelinuxTargetSdk
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSelinuxTargetSdk
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSelinuxTargetSdk
index cd300e5..371164d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSelinuxTargetSdk
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSelinuxTargetSdk
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsSelinuxTargetSdk'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsSelinuxTargetSdk'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsSelinuxTargetSdk',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsSelinuxTargetSdk',
+        tag='9.0_r11.x86.CtsSelinuxTargetSdk',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsSelinuxTargetSdk',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSelinuxTargetSdk25TestCases', '--include-filter', 'CtsSelinuxTargetSdk27TestCases', '--include-filter', 'CtsSelinuxTargetSdkCurrentTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSelinuxTargetSdk',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=7200)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSensorTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSensorTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSensorTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSensorTestCases
index 2ea8c84..6cec0ad 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSensorTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSensorTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsSensorTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsSensorTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:arc-cts-unibuild-hw, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=30,
-        tag='9.0_r10.x86.CtsSensorTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsSensorTestCases',
+        tag='9.0_r11.x86.CtsSensorTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsSensorTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSensorTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSensorTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsShortcut b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsShortcut
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsShortcut
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsShortcut
index bb7520a..936cf54 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsShortcut
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsShortcut
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsShortcut'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsShortcut'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsShortcut',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsShortcut',
+        tag='9.0_r11.x86.CtsShortcut',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsShortcut',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsShortcutHostTestCases', '--include-filter', 'CtsShortcutManagerTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsShortcut',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSimRestrictedApisTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSimRestrictedApisTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSimRestrictedApisTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSimRestrictedApisTestCases
index 0a3e37a..7c68783 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSimRestrictedApisTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSimRestrictedApisTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsSimRestrictedApisTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsSimRestrictedApisTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsSimRestrictedApisTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsSimRestrictedApisTestCases',
+        tag='9.0_r11.x86.CtsSimRestrictedApisTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsSimRestrictedApisTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSimRestrictedApisTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSimRestrictedApisTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSimpleCpuTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSimpleCpuTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSimpleCpuTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSimpleCpuTestCases
index 1513d46..a1861d2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSimpleCpuTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSimpleCpuTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsSimpleCpuTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsSimpleCpuTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsSimpleCpuTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsSimpleCpuTestCases',
+        tag='9.0_r11.x86.CtsSimpleCpuTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsSimpleCpuTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSimpleCpuTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSimpleCpuTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSimpleperfTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSimpleperfTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSimpleperfTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSimpleperfTestCases
index c10a5c3..4ff9cca 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSimpleperfTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSimpleperfTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsSimpleperfTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsSimpleperfTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsSimpleperfTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsSimpleperfTestCases',
+        tag='9.0_r11.x86.CtsSimpleperfTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsSimpleperfTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSimpleperfTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSimpleperfTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSkQPTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSkQPTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSkQPTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSkQPTestCases
index 969b4e0..f16448d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSkQPTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSkQPTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsSkQPTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsSkQPTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsSkQPTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsSkQPTestCases',
+        tag='9.0_r11.x86.CtsSkQPTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsSkQPTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSkQPTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSkQPTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSliceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSliceTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSliceTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSliceTestCases
index f992b96..0238709 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSliceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSliceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsSliceTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsSliceTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsSliceTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsSliceTestCases',
+        tag='9.0_r11.x86.CtsSliceTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsSliceTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSliceTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSliceTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSpeechTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSpeechTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSpeechTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSpeechTestCases
index 51852d3..172c34a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSpeechTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSpeechTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsSpeechTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsSpeechTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsSpeechTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsSpeechTestCases',
+        tag='9.0_r11.x86.CtsSpeechTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsSpeechTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSpeechTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSpeechTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsStatsdHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsStatsdHostTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsStatsdHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsStatsdHostTestCases
index b9ab03f..0b811e2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsStatsdHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsStatsdHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsStatsdHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsStatsdHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsStatsdHostTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsStatsdHostTestCases',
+        tag='9.0_r11.x86.CtsStatsdHostTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsStatsdHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsStatsdHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsStatsdHostTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSustainedPerformanceHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSustainedPerformanceHostTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSustainedPerformanceHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSustainedPerformanceHostTestCases
index d36adaa..04fec34 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSustainedPerformanceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSustainedPerformanceHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsSustainedPerformanceHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsSustainedPerformanceHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsSustainedPerformanceHostTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsSustainedPerformanceHostTestCases',
+        tag='9.0_r11.x86.CtsSustainedPerformanceHostTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsSustainedPerformanceHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSustainedPerformanceHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSustainedPerformanceHostTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSync b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSync
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSync
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSync
index 3b5ad42..4cb1178 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSync
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSync
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsSync'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsSync'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsSync',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsSync',
+        tag='9.0_r11.x86.CtsSync',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsSync',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSyncAccountAccessOtherCertTestCases', '--include-filter', 'CtsSyncContentHostTestCases', '--include-filter', 'CtsSyncManagerTestsCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSync',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=7200)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSystem b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSystem
similarity index 90%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSystem
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSystem
index 1e1410e..17a57a5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSystem
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsSystem
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsSystem'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsSystem'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsSystem',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsSystem',
+        tag='9.0_r11.x86.CtsSystem',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsSystem',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSystemApiAnnotationTestCases', '--include-filter', 'CtsSystemApiSignatureTestCases', '--include-filter', 'CtsSystemIntentTestCases', '--include-filter', 'CtsSystemUiHostTestCases', '--include-filter', 'CtsSystemUiTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsSystem',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=10800)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsTelecom b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsTelecom
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsTelecom
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsTelecom
index df30bfd..c665094 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsTelecom
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsTelecom
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsTelecom'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsTelecom'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsTelecom',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsTelecom',
+        tag='9.0_r11.x86.CtsTelecom',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsTelecom',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTelecomTestCases', '--include-filter', 'CtsTelecomTestCases2', '--include-filter', 'CtsTelecomTestCases3', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsTelecom',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=7200)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsTelephony b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsTelephony
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsTelephony
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsTelephony
index fa8304d..fba6bd1 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsTelephony
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsTelephony
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsTelephony'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsTelephony'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsTelephony',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsTelephony',
+        tag='9.0_r11.x86.CtsTelephony',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsTelephony',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTelephony2TestCases', '--include-filter', 'CtsTelephonyTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsTelephony',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsTextTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsTextTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsTextTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsTextTestCases
index 791ae69..6f69baa 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsTextTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsTextTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsTextTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsTextTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsTextTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsTextTestCases',
+        tag='9.0_r11.x86.CtsTextTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsTextTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsTextTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsTextTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsTheme b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsTheme
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsTheme
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsTheme
index 4515978..c6c63ff 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsTheme
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsTheme
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsTheme'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsTheme'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1, suite:vmtest-informational3'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsTheme',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsTheme',
+        tag='9.0_r11.x86.CtsTheme',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsTheme',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsThemeDeviceTestCases', '--include-filter', 'CtsThemeHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsTheme',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsToast b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsToast
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsToast
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsToast
index 24807f5..249732c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsToast
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsToast
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsToast'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsToast'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsToast',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsToast',
+        tag='9.0_r11.x86.CtsToast',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsToast',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsToastLegacyTestCases', '--include-filter', 'CtsToastTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsToast',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsTransitionTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsTransitionTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsTransitionTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsTransitionTestCases
index 007890f..c8cce19 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsTransitionTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsTransitionTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsTransitionTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsTransitionTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsTransitionTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsTransitionTestCases',
+        tag='9.0_r11.x86.CtsTransitionTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsTransitionTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsTransitionTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsTransitionTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsTrustedVoiceHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsTrustedVoiceHostTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsTrustedVoiceHostTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsTrustedVoiceHostTestCases
index 54fdcd8..cbcaec2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsTrustedVoiceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsTrustedVoiceHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsTrustedVoiceHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsTrustedVoiceHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsTrustedVoiceHostTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsTrustedVoiceHostTestCases',
+        tag='9.0_r11.x86.CtsTrustedVoiceHostTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsTrustedVoiceHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsTrustedVoiceHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsTrustedVoiceHostTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsTv b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsTv
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsTv
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsTv
index 0173137..21ef967 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsTv
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsTv
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsTv'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsTv'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsTv',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsTv',
+        tag='9.0_r11.x86.CtsTv',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsTv',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTvProviderTestCases', '--include-filter', 'CtsTvTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsTv',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsUi b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsUi
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsUi
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsUi
index 9ac16e1..a4bdf67 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsUi
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsUi
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsUi'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsUi'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsUi',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsUi',
+        tag='9.0_r11.x86.CtsUi',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsUi',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUiAutomationTestCases', '--include-filter', 'CtsUiDeviceTestCases', '--include-filter', 'CtsUiRenderingTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsUi',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=7200)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsUidIsolationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsUidIsolationTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsUidIsolationTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsUidIsolationTestCases
index e6c2268..b8f5e41 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsUidIsolationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsUidIsolationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsUidIsolationTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsUidIsolationTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsUidIsolationTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsUidIsolationTestCases',
+        tag='9.0_r11.x86.CtsUidIsolationTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsUidIsolationTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsUidIsolationTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsUidIsolationTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsUsageStatsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsUsageStatsTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsUsageStatsTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsUsageStatsTestCases
index 9d0d74d..5f1a428 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsUsageStatsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsUsageStatsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsUsageStatsTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsUsageStatsTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsUsageStatsTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsUsageStatsTestCases',
+        tag='9.0_r11.x86.CtsUsageStatsTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsUsageStatsTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsUsageStatsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsUsageStatsTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsUsbTests b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsUsbTests
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsUsbTests
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsUsbTests
index 7665a0e..67a1317 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsUsbTests
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsUsbTests
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsUsbTests'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsUsbTests'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsUsbTests',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsUsbTests',
+        tag='9.0_r11.x86.CtsUsbTests',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsUsbTests',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsUsbTests', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsUsbTests',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsUtilTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsUtilTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsUtilTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsUtilTestCases
index b95de5a..ef84173 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsUtilTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsUtilTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsUtilTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsUtilTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsUtilTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsUtilTestCases',
+        tag='9.0_r11.x86.CtsUtilTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsUtilTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsUtilTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsUtilTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsVideoTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsVideoTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsVideoTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsVideoTestCases
index a8bf88d..03b1775 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsVideoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsVideoTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsVideoTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsVideoTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsVideoTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsVideoTestCases',
+        tag='9.0_r11.x86.CtsVideoTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsVideoTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsVideoTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsVideoTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsViewTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsViewTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsViewTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsViewTestCases
index 129d8ff..3ab05e5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsViewTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsViewTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsViewTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsViewTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,15 +20,15 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsViewTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsViewTestCases',
+        tag='9.0_r11.x86.CtsViewTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsViewTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsViewTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsViewTestCases',
         target_plan=None,
         bundle='x86',
         extra_artifacts=['/storage/emulated/0/SurfaceViewSyncTest/'],
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         precondition_commands=['sleep 60'],
         timeout=3600)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsVmTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsVmTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsVmTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsVmTestCases
index 2e51cb4..0670055 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsVmTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsVmTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsVmTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsVmTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsVmTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsVmTestCases',
+        tag='9.0_r11.x86.CtsVmTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsVmTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsVmTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsVmTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsVoice b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsVoice
similarity index 88%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsVoice
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsVoice
index efe83e4..6fc0a06 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsVoice
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsVoice
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsVoice'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsVoice'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsVoice',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsVoice',
+        tag='9.0_r11.x86.CtsVoice',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsVoice',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsVoiceInteractionTestCases', '--include-filter', 'CtsVoiceSettingsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsVoice',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=5400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsVrTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsVrTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsVrTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsVrTestCases
index 5ce4544..3677492 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsVrTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsVrTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsVrTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsVrTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsVrTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsVrTestCases',
+        tag='9.0_r11.x86.CtsVrTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsVrTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsVrTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsVrTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsWebkitTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsWebkitTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsWebkitTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsWebkitTestCases
index 3e1c776..22ac78b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsWebkitTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsWebkitTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsWebkitTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsWebkitTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsWebkitTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsWebkitTestCases',
+        tag='9.0_r11.x86.CtsWebkitTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsWebkitTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsWebkitTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsWebkitTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsWidgetTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsWidgetTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsWidgetTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsWidgetTestCases
index 665e52e..b705113 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsWidgetTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsWidgetTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsWidgetTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsWidgetTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsWidgetTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsWidgetTestCases',
+        tag='9.0_r11.x86.CtsWidgetTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsWidgetTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsWidgetTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsWidgetTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsWindowManagerDeviceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsWindowManagerDeviceTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsWindowManagerDeviceTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsWindowManagerDeviceTestCases
index 0560f66..2addc7d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsWindowManagerDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsWindowManagerDeviceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsWindowManagerDeviceTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsWindowManagerDeviceTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsWindowManagerDeviceTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsWindowManagerDeviceTestCases',
+        tag='9.0_r11.x86.CtsWindowManagerDeviceTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsWindowManagerDeviceTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsWindowManagerDeviceTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsWindowManagerDeviceTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsWrap b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsWrap
similarity index 89%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsWrap
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsWrap
index 8bb1153..6a23cab 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsWrap
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsWrap
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.CtsWrap'
+NAME = 'cheets_CTS_P.9.0_r11.x86.CtsWrap'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.CtsWrap',
-        test_name='cheets_CTS_P.9.0_r10.x86.CtsWrap',
+        tag='9.0_r11.x86.CtsWrap',
+        test_name='cheets_CTS_P.9.0_r11.x86.CtsWrap',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsWrapNoWrapTestCases', '--include-filter', 'CtsWrapWrapDebugMallocDebugTestCases', '--include-filter', 'CtsWrapWrapDebugTestCases', '--include-filter', 'CtsWrapWrapNoDebugTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='CtsWrap',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=9000)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases
index d7977b5..9a50330 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r10.x86.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases',
+        tag='9.0_r11.x86.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAbiOverrideHostTestCases', '--include-filter', 'CtsAccelerationTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=172800)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases
index f4d4d75..2a118d9 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r10.x86.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases',
+        tag='9.0_r11.x86.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAccessibilityServiceTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=172800)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases
index f99955d..7855388 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r10.x86.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases',
+        tag='9.0_r11.x86.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAccessibilityTestCases', '--include-filter', 'CtsAccountManagerTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=172800)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases
rename to server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases
index c55ce3b..57c711a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r10.x86.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r10.x86.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases',
+        tag='9.0_r11.x86.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsActivityManagerDeviceSdk25TestCases', '--include-filter', 'CtsActivityManagerDeviceTestCases', '--logcat-on-failure', '--dynamic-config-url='],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
         target_module='all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         timeout=172800)