Snap for 6227479 from 24e35fe5e5d027a2f0f96c568680da1ffc2d303b to rvc-releaseandroid-vts-11.0_r9android-vts-11.0_r8android-vts-11.0_r7android-vts-11.0_r6android-vts-11.0_r5android-vts-11.0_r4android-vts-11.0_r3android-vts-11.0_r2android-vts-11.0_r16android-vts-11.0_r15android-vts-11.0_r14android-vts-11.0_r13android-vts-11.0_r12android-vts-11.0_r11android-vts-11.0_r10android-vts-11.0_r1android-security-11.0.0_r76android-security-11.0.0_r75android-security-11.0.0_r74android-security-11.0.0_r73android-security-11.0.0_r72android-security-11.0.0_r71android-security-11.0.0_r70android-security-11.0.0_r69android-security-11.0.0_r68android-security-11.0.0_r67android-security-11.0.0_r66android-security-11.0.0_r65android-security-11.0.0_r64android-security-11.0.0_r63android-security-11.0.0_r62android-security-11.0.0_r61android-security-11.0.0_r60android-security-11.0.0_r59android-security-11.0.0_r58android-security-11.0.0_r57android-security-11.0.0_r56android-security-11.0.0_r55android-security-11.0.0_r54android-security-11.0.0_r53android-security-11.0.0_r52android-security-11.0.0_r51android-security-11.0.0_r50android-security-11.0.0_r49android-security-11.0.0_r1android-r-preview-4android-r-preview-3android-r-beta-3android-r-beta-2android-platform-11.0.0_r9android-platform-11.0.0_r8android-platform-11.0.0_r7android-platform-11.0.0_r6android-platform-11.0.0_r5android-platform-11.0.0_r40android-platform-11.0.0_r4android-platform-11.0.0_r39android-platform-11.0.0_r38android-platform-11.0.0_r37android-platform-11.0.0_r36android-platform-11.0.0_r35android-platform-11.0.0_r34android-platform-11.0.0_r33android-platform-11.0.0_r32android-platform-11.0.0_r31android-platform-11.0.0_r30android-platform-11.0.0_r3android-platform-11.0.0_r29android-platform-11.0.0_r28android-platform-11.0.0_r27android-platform-11.0.0_r26android-platform-11.0.0_r25android-platform-11.0.0_r24android-platform-11.0.0_r23android-platform-11.0.0_r22android-platform-11.0.0_r21android-platform-11.0.0_r20android-platform-11.0.0_r2android-platform-11.0.0_r19android-platform-11.0.0_r18android-platform-11.0.0_r17android-platform-11.0.0_r16android-platform-11.0.0_r15android-platform-11.0.0_r14android-platform-11.0.0_r13android-platform-11.0.0_r12android-platform-11.0.0_r11android-platform-11.0.0_r10android-platform-11.0.0_r1android-cts-11.0_r9android-cts-11.0_r8android-cts-11.0_r7android-cts-11.0_r6android-cts-11.0_r5android-cts-11.0_r4android-cts-11.0_r3android-cts-11.0_r2android-cts-11.0_r16android-cts-11.0_r15android-cts-11.0_r14android-cts-11.0_r13android-cts-11.0_r12android-cts-11.0_r11android-cts-11.0_r10android-cts-11.0_r1android-11.0.0_r6android-11.0.0_r5android-11.0.0_r4android-11.0.0_r3android-11.0.0_r25android-11.0.0_r2android-11.0.0_r17android-11.0.0_r1r-beta-2android11-tests-releaseandroid11-security-releaseandroid11-s1-releaseandroid11-releaseandroid11-platform-releaseandroid11-gsi

Change-Id: I9cf5e868612a07a3f91943623a90c2f269b8e390

373 files changed, 1971 insertions, 1514 deletions

diff --git a/client/cros/chameleon/chameleon.py b/client/cros/chameleon/chameleon.py
index 4f14c8ca94..0921e04abc 100644
--- a/client/cros/chameleon/chameleon.py
+++ b/client/cros/chameleon/chameleon.py
@@ -27,6 +27,7 @@ from autotest_lib.client.cros.chameleon import usb_controller
 CHAMELEON_PORT = 9992
 CHAMELEOND_LOG_REMOTE_PATH = '/var/log/chameleond'
 DAEMON_LOG_REMOTE_PATH = '/var/log/daemon.log'
+BTMON_LOG_REMOTE_PATH = '/var/log/btsnoop.log'
 CHAMELEON_READY_TEST = 'GetSupportedPorts'
 
 
@@ -320,6 +321,42 @@ class ChameleonBoard(object):
                 atexit.register(log_new_func)
 
 
+        def btmon_atexit_gen(btmon_pid):
+            """Generate a function to kill the btmon process and save the log
+
+            @param btmon_pid: PID of the btmon process
+            """
+
+            def btmon_atexit():
+                """Kill the btmon with specified PID and save the log"""
+
+                file_name = os.path.basename(BTMON_LOG_REMOTE_PATH)
+                target_path = os.path.join(log_dir, file_name)
+
+                self.host.run('kill %d' % btmon_pid)
+                self.host.get_file(BTMON_LOG_REMOTE_PATH, target_path)
+            return btmon_atexit
+
+
+        # Kill all btmon process before creating a new one
+        self.host.run('pkill btmon || true')
+
+        # Get available btmon options in the chameleon host
+        btmon_options = ''
+        btmon_help = self.host.run('btmon --help').stdout
+
+        for option in 'SA':
+            if '-%s' % option in btmon_help:
+                btmon_options += option
+
+        # Store btmon log
+        btmon_pid = int(self.host.run_background('btmon -%sw %s'
+                                                % (btmon_options,
+                                                BTMON_LOG_REMOTE_PATH)))
+        if btmon_pid > 0:
+            atexit.register(btmon_atexit_gen(btmon_pid))
+
+
     def reboot(self):
         """Reboots Chameleon board."""
         self._chameleond_proxy.Reboot()
diff --git a/client/cros/faft/rpc_functions.py b/client/cros/faft/rpc_functions.py
index 07cba35ce2..3b8a7d6063 100644
--- a/client/cros/faft/rpc_functions.py
+++ b/client/cros/faft/rpc_functions.py
@@ -754,13 +754,12 @@ class SystemServicer(object):
 
         @return: A string of the platform name.
         """
-        # 'mosys platform name' sometimes fails. Let's get the verbose output.
-        lines = self._os_if.run_shell_command_get_output(
-                '(mosys -vvv platform name 2>&1) || echo Failed')
-        if lines[-1].strip() == 'Failed':
-            raise Exception('Failed getting platform name: ' +
-                            '\n'.join(lines))
-        return lines[-1]
+        platform = cros_config.call_cros_config_get_output(
+                '/identity platform-name',
+                self._os_if.run_shell_command_get_result)
+        if not platform:
+            raise Exception('Failed getting platform name from cros_config')
+        return platform
 
     def get_model_name(self):
         """Get the model name of the current system.
diff --git a/client/site_tests/dummy_SynchronousOffload/control.client b/client/site_tests/dummy_SynchronousOffload/control
index 39a6559baa..6f205bd968 100644
--- a/client/site_tests/dummy_SynchronousOffload/control.client
+++ b/client/site_tests/dummy_SynchronousOffload/control
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 AUTHOR = "jkop@google.com"
-NAME = "dummy_SynchronousOffload.client"
+NAME = "dummy_SynchronousOffload"
 PURPOSE = "Verify tests can offload output from DUTs."
 TIME = "SHORT"
 TEST_CATEGORY = "General"
@@ -12,7 +12,7 @@ TEST_TYPE = "client"
 
 DOC = """
 This test creates a file in $SYNCHRONOUS_OFFLOAD_DIR on the DUT and succeeds.
-The task will fail only if the offload of that file fails.
+The task will fail only if the creation or offload of that file fails.
 """
 
 job.run_test('dummy_SynchronousOffload')
diff --git a/client/site_tests/dummy_SynchronousOffload/dummy_SynchronousOffload.py b/client/site_tests/dummy_SynchronousOffload/dummy_SynchronousOffload.py
index 5e0b6ce145..2c8c519c49 100644
--- a/client/site_tests/dummy_SynchronousOffload/dummy_SynchronousOffload.py
+++ b/client/site_tests/dummy_SynchronousOffload/dummy_SynchronousOffload.py
@@ -7,7 +7,7 @@ import os
 
 from autotest_lib.client.bin import test
 
-class dummy_Pass(test.test):
+class dummy_SynchronousOffload(test.test):
   version = 1
 
   def initialize(self):
diff --git a/client/site_tests/power_BatteryDrain/power_BatteryDrain.py b/client/site_tests/power_BatteryDrain/power_BatteryDrain.py
index 0df545fa9e..234ffc9a0f 100644
--- a/client/site_tests/power_BatteryDrain/power_BatteryDrain.py
+++ b/client/site_tests/power_BatteryDrain/power_BatteryDrain.py
@@ -2,14 +2,13 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 import logging
-import os
 
 from autotest_lib.client.bin import test
-from autotest_lib.client.bin import utils
 from autotest_lib.client.common_lib import error
 from autotest_lib.client.common_lib.cros import chrome
-from autotest_lib.client.common_lib import utils as common_utils
-from autotest_lib.client.cros.power import power_status, power_utils
+from autotest_lib.client.common_lib import utils
+from autotest_lib.client.cros.power import power_status
+from autotest_lib.client.cros.power import power_utils
 
 class power_BatteryDrain(test.test):
     """Not a test, but a utility for server tests to drain the battery below
@@ -19,6 +18,8 @@ class power_BatteryDrain(test.test):
     backlight = None
     keyboard_backlight = None
 
+    url = 'https://crospower.page.link/power_BatteryDrain'
+
     def cleanup(self):
         '''Cleanup for a test run'''
         if self._force_discharge:
@@ -67,25 +68,9 @@ class power_BatteryDrain(test.test):
             logging.info("Assuming no keyboard backlight due to %s", str(e))
             self.keyboard_backlight = None
 
-        with chrome.Chrome(logged_in=False,
-                           init_network_controller=True) as cr:
-
-            # Extract the static WebGL website and serve it locally.
-            # Unfortunately we can't re-use the static website used in the
-            # graphics_WebGLAquarium test because that website does not have
-            # enough fish displayed. This static website is a copy of that
-            # website, with more fish added, and some metrics and other cruft
-            # removed.
-            # TODO(crbug.com/1019455): unify this static website with the
-            # other versions of WebGLAquarium used throughout autotest.
-            tarball_path = os.path.join(self.bindir, 'webgl-aquarium.tar.bz2')
-            utils.extract_tarball_to_dir(tarball_path, self.srcdir)
-            cr.browser.platform.SetHTTPServerDirectories(self.srcdir)
-            html_path = os.path.join(self.srcdir, 'aquarium.html')
-            url = cr.browser.platform.http_server.UrlOf(html_path)
-
+        with chrome.Chrome(init_network_controller=True) as cr:
             tab = cr.browser.tabs.New()
-            tab.Navigate(url)
+            tab.Navigate(self.url)
 
             logging.info(
                 'Waiting {} seconds for battery to drain to {} percent'.format(
@@ -101,7 +86,7 @@ class power_BatteryDrain(test.test):
             err = error.TestFail(
                 "Battery did not drain to {} percent in {} seconds".format(
                     drain_to_percent, drain_timeout))
-            common_utils.poll_for_condition(is_battery_low_enough,
+            utils.poll_for_condition(is_battery_low_enough,
                                             exception=err,
                                             timeout=drain_timeout,
                                             sleep_interval=1)
diff --git a/client/site_tests/power_BatteryDrain/webgl-aquarium.tar.bz2 b/client/site_tests/power_BatteryDrain/webgl-aquarium.tar.bz2
deleted file mode 100644
index 56a4824d33..0000000000
--- a/client/site_tests/power_BatteryDrain/webgl-aquarium.tar.bz2
+++ /dev/null
diff --git a/server/cros/bluetooth/bluetooth_adapter_hidreports_tests.py b/server/cros/bluetooth/bluetooth_adapter_hidreports_tests.py
index af9ae71f49..03b311d85a 100644
--- a/server/cros/bluetooth/bluetooth_adapter_hidreports_tests.py
+++ b/server/cros/bluetooth/bluetooth_adapter_hidreports_tests.py
@@ -8,7 +8,6 @@ import logging
 import time
 
 from autotest_lib.server.cros.bluetooth import bluetooth_adapter_tests
-from autotest_lib.server.cros.multimedia import remote_facade_factory
 
 
 class BluetoothAdapterHIDReportTests(
@@ -82,13 +81,7 @@ class BluetoothAdapterHIDReportTests(
             self.test_device_name(device.address, device.name)
 
         if reboot:
-            self.host.reboot()
-
-            # NOTE: We need to recreate the bluetooth_facade after a reboot.
-            factory = remote_facade_factory.RemoteFacadeFactory(
-                self.host, disable_arc=True)
-            self.bluetooth_facade = factory.create_bluetooth_hid_facade()
-            self.input_facade = factory.create_input_facade()
+            self.reboot()
 
             time.sleep(self.HID_TEST_SLEEP_SECS)
             self.test_device_is_paired(device.address)
diff --git a/server/cros/bluetooth/bluetooth_adapter_quick_tests.py b/server/cros/bluetooth/bluetooth_adapter_quick_tests.py
index 803ab493be..6da5f9b434 100644
--- a/server/cros/bluetooth/bluetooth_adapter_quick_tests.py
+++ b/server/cros/bluetooth/bluetooth_adapter_quick_tests.py
@@ -54,9 +54,9 @@ class BluetoothAdapterQuickTests(bluetooth_adapter_tests.BluetoothAdapterTests):
         # Restart the link to device
         logging.info('Restarting peer devices...')
 
-        # Grab currect device list for initialization
+        # Grab current device list for initialization
         connected_devices = self.devices
-        self.cleanup(on_start=False)
+        self.cleanup(test_state='MID')
 
         for device_type, device_list in connected_devices.items():
             for device in device_list:
@@ -101,8 +101,7 @@ class BluetoothAdapterQuickTests(bluetooth_adapter_tests.BluetoothAdapterTests):
                 """object has no attribute 'object_path'""" in str(e)):
 
                 logging.error('Caught b/142276989, rebooting DUT')
-                self.host.reboot()
-
+                self.reboot()
             # Raise the original exception
             raise
 
@@ -128,6 +127,11 @@ class BluetoothAdapterQuickTests(bluetooth_adapter_tests.BluetoothAdapterTests):
 
         self.enable_disable_debug_log(enable=True)
 
+        # Delete files created in previous run
+        self.host.run('[ ! -d {0} ] || rm -rf {0} || true'.format(
+                                                    self.BTMON_DIR_LOG_PATH))
+        self.start_new_btmon()
+
         self.flag = flag
         self.test_iter = None
 
@@ -288,7 +292,7 @@ class BluetoothAdapterQuickTests(bluetooth_adapter_tests.BluetoothAdapterTests):
             self.group_chameleons_type()
 
         # Close the connection between peers
-        self.cleanup()
+        self.cleanup(test_state='NEW')
 
 
     @staticmethod
diff --git a/server/cros/bluetooth/bluetooth_adapter_tests.py b/server/cros/bluetooth/bluetooth_adapter_tests.py
index 80701b510b..01e7c5848d 100644
--- a/server/cros/bluetooth/bluetooth_adapter_tests.py
+++ b/server/cros/bluetooth/bluetooth_adapter_tests.py
@@ -27,6 +27,7 @@ from autotest_lib.client.bin.input.linux_input import (
         BTN_LEFT, BTN_RIGHT, EV_KEY, EV_REL, REL_X, REL_Y, REL_WHEEL)
 from autotest_lib.server.cros.bluetooth.bluetooth_gatt_client_utils import (
         GATT_ClientFacade, GATT_Application, GATT_HIDApplication)
+from autotest_lib.server.cros.multimedia import remote_facade_factory
 
 
 Event = recorder.Event
@@ -560,6 +561,9 @@ class BluetoothAdapterTests(test.test):
     # Board list for name/ID test check. These devices don't need to be tested
     REFERENCE_BOARDS = ['rambi', 'nyan', 'oak', 'reef', 'yorp', 'bip']
 
+    # Path for btmon logs
+    BTMON_DIR_LOG_PATH = '/var/log/btmon'
+
     def group_chameleons_type(self):
         """Group all chameleons by the type of their detected device."""
 
@@ -801,6 +805,28 @@ class BluetoothAdapterTests(test.test):
         logging.info('The DUT is waken up.')
 
 
+    def reboot(self):
+        """Reboot the DUT and recreate necessary processes and variables"""
+        self.host.reboot()
+
+        # We need to recreate the bluetooth_facade after a reboot.
+        # Delete the proxy first so it won't delete the old one, which
+        # invokes disconnection, after creating the new one.
+        del self.factory
+        del self.bluetooth_facade
+        del self.input_facade
+        self.factory = remote_facade_factory.RemoteFacadeFactory(self.host,
+                       disable_arc=True)
+        self.bluetooth_facade = self.factory.create_bluetooth_hid_facade()
+        self.input_facade = self.factory.create_input_facade()
+
+        # Re-enable debugging verbose since Chrome will set it to
+        # default(disable).
+        self.enable_disable_debug_log(enable=True)
+
+        self.start_new_btmon()
+
+
     def _wait_till_condition_holds(self, func, method_name,
                                    timeout=DEFAULT_HOLD_TIMEOUT_SECS,
                                    sleep_interval=DEFAULT_HOLD_SLEEP_SECS,
@@ -916,6 +942,22 @@ class BluetoothAdapterTests(test.test):
         self.bluetooth_facade.set_debug_log_levels(level, level, level, level)
 
 
+    def start_new_btmon(self):
+        """ Start a new btmon process and save the log """
+
+        # Kill all btmon process before creating a new one
+        self.host.run('pkill btmon || true')
+
+        # Make sure the directory exists
+        self.host.run('mkdir -p %s' % self.BTMON_DIR_LOG_PATH)
+
+        # Time format. Ex, 2020_02_20_17_52_45
+        now = time.strftime("%Y_%m_%d_%H_%M_%S")
+        file_name = 'btsnoop_%s' % now
+        self.host.run_background('btmon -SAw %s/%s' % (self.BTMON_DIR_LOG_PATH,
+                                                       file_name))
+
+
     def log_message(self, msg):
         """ Write a string to log."""
         self.bluetooth_facade.log_message(msg)
@@ -3184,10 +3226,21 @@ class BluetoothAdapterTests(test.test):
         raise NotImplementedError
 
 
-    def cleanup(self, on_start=True):
-        """Clean up bluetooth adapter tests."""
-        # Disable all the bluetooth debug logs
-        self.enable_disable_debug_log(enable=False)
+    def cleanup(self, test_state='END'):
+        """Clean up bluetooth adapter tests.
+
+        @param test_state: string describing the requested clear is for
+                           a new test(NEW), the middle of the test(MID),
+                           or the end of the test(END).
+        """
+
+        if test_state is 'END':
+            # Disable all the bluetooth debug logs
+            self.enable_disable_debug_log(enable=False)
+
+            if hasattr(self, 'host'):
+                # Stop btmon process
+                self.host.run('pkill btmon || true')
 
         # Close the device properly if a device is instantiated.
         # Note: do not write something like the following statements
@@ -3202,7 +3255,7 @@ class BluetoothAdapterTests(test.test):
                     device.Close()
 
                     # Power cycle BT device if we're in the middle of a test
-                    if not on_start:
+                    if test_state is 'MID':
                         device.PowerCycle()
 
         self.devices = dict()
diff --git a/server/cros/faft/cr50_test.py b/server/cros/faft/cr50_test.py
index 64f29ce3ff..c9ef5bea1d 100644
--- a/server/cros/faft/cr50_test.py
+++ b/server/cros/faft/cr50_test.py
@@ -20,6 +20,7 @@ class Cr50Test(FirmwareTest):
     """Base class that sets up helper objects/functions for cr50 tests."""
     version = 1
 
+    RELEASE_POOLS = ['faft-cr50', 'faft-cr50-experimental']
     RESPONSE_TIMEOUT = 180
     GS_PRIVATE = 'gs://chromeos-localmirror-private/distfiles/'
     # Prod signed test images are stored in the private cr50 directory.
@@ -73,6 +74,9 @@ class Cr50Test(FirmwareTest):
         if not hasattr(self, 'cr50'):
             raise error.TestNAError('Test can only be run on devices with '
                                     'access to the Cr50 console')
+        # TODO(b/149948314): remove when dual-v4 is sorted out.
+        if 'ccd_cr50' in self.servo.get_servo_version():
+            self.servo.set_nocheck('watchdog_remove', 'ccd')
 
         logging.info('Test Args: %r', full_args)
 
@@ -117,20 +121,22 @@ class Cr50Test(FirmwareTest):
 
         # TODO(b/143888583): remove qual update during init once new design to
         # to provision cr50 updates is in place.
-        is_qual = full_args.get('is_qual', '').lower() == 'true'
-        if is_qual or self.running_qual_suite():
+        # Make sure the release image is running before starting the test.
+        is_release_qual = full_args.get('is_release_qual', '').lower() == 'true'
+        if is_release_qual or self.running_cr50_release_suite():
             release_ver_arg = full_args.get('release_ver', '')
             release_path_arg = full_args.get('release_path', '')
             self.ensure_qual_image_is_running(release_ver_arg, release_path_arg)
 
 
-    def running_qual_suite(self):
-        """Return True if the qual image needs to be running."""
+    def running_cr50_release_suite(self):
+        """Return True if the DUT is in a release pool."""
         for pool in self.host.host_info_store.get().pools:
             # TODO(b/149109740): remove once the pool values are verified.
             # Change to run with faft-cr50 and faft-cr50-experimental suites.
             logging.info('Checking pool: %s', pool)
-            if 'faft-cr50-experimental' in pool:
+            if pool in self.RELEASE_POOLS:
+                logging.info('Running a release test.')
                 return True
         return False
 
@@ -205,8 +211,8 @@ class Cr50Test(FirmwareTest):
             logging.info('Running qual image. No update needed.')
             return
         logging.info('Cr50 qual update required.')
-        # TODO(b/149109740): remove once running_qual_suite logic has been
-        # verified.
+        # TODO(b/149109740): remove once running_cr50_release_suite logic has
+        # been verified.
         logging.info('Skipping until logic has been verified')
         return
         filesystem_util.make_rootfs_writable(self.host)
diff --git a/server/cros/network/attenuator_hosts.py b/server/cros/network/attenuator_hosts.py
index 7d1cdf5987..52a3b286de 100644
--- a/server/cros/network/attenuator_hosts.py
+++ b/server/cros/network/attenuator_hosts.py
@@ -14,35 +14,35 @@ HOST_FIXED_ATTENUATIONS = {
                 2: {2437: 53, 5220: 59, 5765: 59},
                 3: {2437: 57, 5220: 56, 5765: 56}},
         'chromeos1-dev-host15-attenuator': {
-                0: {2437: 52, 5220: 57, 5765: 57},
-                1: {2437: 56, 5220: 55, 5765: 59},
-                2: {2437: 52, 5220: 57, 5765: 57},
-                3: {2437: 56, 5220: 55, 5765: 60}},
-        'chromeos1-dev-host16-attenuator': {
-                0: {2437: 52, 5220: 58, 5765: 62},
-                1: {2437: 55, 5220: 55, 5765: 56},
-                2: {2437: 52, 5220: 58, 5765: 61},
-                3: {2437: 55, 5220: 55, 5765: 56}},
-        'chromeos1-dev-host17-attenuator': {
-                0: {2437: 52, 5220: 58, 5765: 57},
-                1: {2437: 56, 5220: 55, 5765: 59},
-                2: {2437: 52, 5220: 57, 5765: 58},
-                3: {2437: 56, 5220: 55, 5765: 59}},
-        'chromeos1-dev-host18-attenuator': {
-                0: {2437: 52, 5220: 57, 5765: 57},
-                1: {2437: 56, 5220: 56, 5765: 59},
-                2: {2437: 52, 5220: 57, 5765: 57},
-                3: {2437: 56, 5220: 56, 5765: 59}},
-        'chromeos1-dev-host19-attenuator': {
-                0: {2437: 52, 5220: 57, 5765: 60},
-                1: {2437: 55, 5220: 54, 5765: 56},
-                2: {2437: 52, 5220: 57, 5765: 60},
-                3: {2437: 55, 5220: 54, 5765: 55}},
-        'chromeos1-dev-host20-attenuator': {
-                0: {2437: 53, 5220: 57, 5765: 62},
-                1: {2437: 57, 5220: 55, 5765: 55},
-                2: {2437: 53, 5220: 57, 5765: 61},
-                3: {2437: 57, 5220: 55, 5765: 55}},
+                0: {2437: 32, 5220: 36, 5765: 38},
+                1: {2437: 35, 5220: 34, 5765: 36},
+                2: {2437: 32, 5220: 36, 5765: 38},
+                3: {2437: 35, 5220: 34, 5765: 36}},
+        'chromeos1-dev-host16-attenuator': {
+                0: {2437: 32, 5220: 37, 5765: 39},
+                1: {2437: 35, 5220: 34, 5765: 36},
+                2: {2437: 32, 5220: 37, 5765: 39},
+                3: {2437: 35, 5220: 34, 5765: 36}},
+        'chromeos1-dev-host17-attenuator': {
+                0: {2437: 33, 5220: 36, 5765: 38},
+                1: {2437: 35, 5220: 34, 5765: 36},
+                2: {2437: 33, 5220: 36, 5765: 38},
+                3: {2437: 35, 5220: 34, 5765: 36}},
+        'chromeos1-dev-host18-attenuator': {
+                0: {2437: 32, 5220: 36, 5765: 37},
+                1: {2437: 35, 5220: 34, 5765: 35},
+                2: {2437: 32, 5220: 36, 5765: 37},
+                3: {2437: 35, 5220: 34, 5765: 35}},
+        'chromeos1-dev-host19-attenuator': {
+                0: {2437: 52, 5220: 57, 5765: 60},
+                1: {2437: 55, 5220: 54, 5765: 56},
+                2: {2437: 52, 5220: 57, 5765: 60},
+                3: {2437: 55, 5220: 54, 5765: 55}},
+        'chromeos1-dev-host20-attenuator': {
+                0: {2437: 53, 5220: 57, 5765: 62},
+                1: {2437: 57, 5220: 55, 5765: 55},
+                2: {2437: 53, 5220: 57, 5765: 61},
+                3: {2437: 57, 5220: 55, 5765: 55}},
         'chromeos1-test-host2-attenuator': {
                 0: {2437: 53, 5220: 59, 5765: 58},
                 1: {2437: 57, 5220: 57, 5765: 59},
diff --git a/server/hosts/cros_host.py b/server/hosts/cros_host.py
index 83d348c0ff..cca80590f0 100644
--- a/server/hosts/cros_host.py
+++ b/server/hosts/cros_host.py
@@ -1279,7 +1279,7 @@ class CrosHost(abstract_ssh.AbstractSSHHost):
                     duration, fields=metric_fields)
 
 
-    def suspend(self, suspend_time=60,
+    def suspend(self, suspend_time=60, delay_seconds=0,
                 suspend_cmd=None, allow_early_resume=False):
         """
         This function suspends the site host.
@@ -1297,7 +1297,7 @@ class CrosHost(abstract_ssh.AbstractSSHHost):
             suspend_cmd = ' && '.join([
                 'echo 0 > /sys/class/rtc/rtc0/wakealarm',
                 'echo +%d > /sys/class/rtc/rtc0/wakealarm' % suspend_time,
-                'powerd_dbus_suspend --delay=0'])
+                'powerd_dbus_suspend --delay=%d' % delay_seconds])
         super(CrosHost, self).suspend(suspend_time, suspend_cmd,
                                       allow_early_resume);
 
diff --git a/server/site_tests/cheets_CTS_Instant/control.9.0_r10.arm.all b/server/site_tests/cheets_CTS_Instant/control.9.0_r11.arm.all
index 61efe53823..1d049a6612 100644
--- a/server/site_tests/cheets_CTS_Instant/control.9.0_r10.arm.all
+++ b/server/site_tests/cheets_CTS_Instant/control.9.0_r11.arm.all
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_Instant.9.0_r10.arm.all'
+NAME = 'cheets_CTS_Instant.9.0_r11.arm.all'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_cpu_arm'
 JOB_RETRIES = 0
@@ -21,14 +21,14 @@ def run_TS(machine):
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r10.arm.all',
-        test_name='cheets_CTS_Instant.9.0_r10.arm.all',
+        tag='9.0_r11.arm.all',
+        test_name='cheets_CTS_Instant.9.0_r11.arm.all',
         run_template=['run', 'commandAndExit', 'cts-instant', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module=None,
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts_instant-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts_instant-9.0_r11-linux_x86-arm.zip',
         login_precondition_commands=['lsblk -do NAME,RM | sed -n s/1$//p | xargs -n1 eject'],
         timeout=18000)
 
diff --git a/server/site_tests/cheets_CTS_Instant/control.9.0_r10.arm.tradefed-run-collect-tests-only-internal b/server/site_tests/cheets_CTS_Instant/control.9.0_r11.arm.tradefed-run-collect-tests-only-internal
index f703c53c44..f67f564fd2 100644
--- a/server/site_tests/cheets_CTS_Instant/control.9.0_r10.arm.tradefed-run-collect-tests-only-internal
+++ b/server/site_tests/cheets_CTS_Instant/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_Instant.9.0_r10.arm.tradefed-run-collect-tests-only-internal'
+NAME = 'cheets_CTS_Instant.9.0_r11.arm.tradefed-run-collect-tests-only-internal'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_cpu_arm'
 JOB_RETRIES = 0
@@ -21,14 +21,14 @@ def run_TS(machine):
         hosts=host_list,
         iterations=1,
         max_retry=0,
-        tag='9.0_r10.arm.tradefed-run-collect-tests-only-internal',
-        test_name='cheets_CTS_Instant.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_Instant.9.0_r11.arm.tradefed-run-collect-tests-only-internal',
         run_template=['run', 'commandAndExit', 'collect-tests-only', '--disable-reboot'],
         retry_template=None,
         target_module=None,
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts_instant-9.0_r10-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts_instant-9.0_r11-linux_x86-arm.zip',
         timeout=7200)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_Instant/control.9.0_r10.x86.all b/server/site_tests/cheets_CTS_Instant/control.9.0_r11.x86.all
index b2691077c7..c2a3e760a7 100644
--- a/server/site_tests/cheets_CTS_Instant/control.9.0_r10.x86.all
+++ b/server/site_tests/cheets_CTS_Instant/control.9.0_r11.x86.all
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_Instant.9.0_r10.x86.all'
+NAME = 'cheets_CTS_Instant.9.0_r11.x86.all'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_cpu_x86'
 JOB_RETRIES = 0
@@ -21,14 +21,14 @@ def run_TS(machine):
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r10.x86.all',
-        test_name='cheets_CTS_Instant.9.0_r10.x86.all',
+        tag='9.0_r11.x86.all',
+        test_name='cheets_CTS_Instant.9.0_r11.x86.all',
         run_template=['run', 'commandAndExit', 'cts-instant', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module=None,
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts_instant-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts_instant-9.0_r11-linux_x86-x86.zip',
         login_precondition_commands=['lsblk -do NAME,RM | sed -n s/1$//p | xargs -n1 eject'],
         timeout=18000)
 
diff --git a/server/site_tests/cheets_CTS_Instant/control.9.0_r10.x86.tradefed-run-collect-tests-only-internal b/server/site_tests/cheets_CTS_Instant/control.9.0_r11.x86.tradefed-run-collect-tests-only-internal
index a4921d4d06..ff806f03ed 100644
--- a/server/site_tests/cheets_CTS_Instant/control.9.0_r10.x86.tradefed-run-collect-tests-only-internal
+++ b/server/site_tests/cheets_CTS_Instant/control.9.0_r11.x86.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_Instant.9.0_r10.x86.tradefed-run-collect-tests-only-internal'
+NAME = 'cheets_CTS_Instant.9.0_r11.x86.tradefed-run-collect-tests-only-internal'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_cpu_x86'
 JOB_RETRIES = 0
@@ -21,14 +21,14 @@ def run_TS(machine):
         hosts=host_list,
         iterations=1,
         max_retry=0,
-        tag='9.0_r10.x86.tradefed-run-collect-tests-only-internal',
-        test_name='cheets_CTS_Instant.9.0_r10.x86.tradefed-run-collect-tests-only-internal',
+        tag='9.0_r11.x86.tradefed-run-collect-tests-only-internal',
+        test_name='cheets_CTS_Instant.9.0_r11.x86.tradefed-run-collect-tests-only-internal',
         run_template=['run', 'commandAndExit', 'collect-tests-only', '--disable-reboot'],
         retry_template=None,
         target_module=None,
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts_instant-9.0_r10-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts_instant-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.arm.CtsAbiOverrideHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAbiOverrideHostTestCases
index fe8f1d03cf..dbac881aaa 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index b6501a4751..8ddd555388 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 @@ def run_TS(machine):
         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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index ecf9edf8e4..568bdfa03a 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 6bb98a9730..52d47a5eaf 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 @@ def run_TS(machine):
         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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 8ed0571353..64bb59a7c5 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index ea5e026b1e..80e1c65244 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 06ab5bf281..4ffef8772d 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 7776a36d44..6bf96da607 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 96196adc7f..67556bbe1c 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 702d3c182d..8afd5ac900 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 157ca8d99c..d26da6db50 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 @@ def run_TS(machine):
         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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 98625a778d..5efe4abcaf 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 2ff5f23e9a..1d0dc42ca4 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 836503f806..146a19ada9 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 31f9812d59..d4140ae321 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 3db2594fe3..f362f5132c 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index c6ab80ecaa..2d5d20794a 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index c17aab158a..1728e1b73e 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 0803c9719f..66400ec92e 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 3476a036d5..039c8f6937 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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',
         prerequisites=['bluetooth'],
         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
index 5733276bed..c2d912d0a9 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index bf2ad7dccb..0469c72bc7 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 6c9fb8c596..c83591d73c 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 3f67a93de8..f64d16bad6 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 @@ def run_TS(machine):
         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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index f9f15c1351..814cefdf0f 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 @@ def run_TS(machine):
         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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 0a6c26335e..1b5d6d411e 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 730c3b22e7..f0f144c9be 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index ff3a5e3c61..a78aaf6e5d 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 7ac71267b6..78cbdd4c72 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 56a11f53e2..f72d0886b3 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index a2955447c9..d777eabf17 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 @@ def run_TS(machine):
         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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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',
         prerequisites=['region_us'],
         timeout=3600)
 
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
index 22e6c3555d..cf50de7e2b 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index e8350b8ea8..c35e14fd79 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 8ad3433bd8..2ba24a201f 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 1959c8320c..80dd45f253 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index bbb709f8b5..9ed9d4cd55 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 @@ def run_TS(machine):
         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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index be25a18a1a..36892b6da2 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-week'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 0
@@ -20,14 +20,14 @@ def run_TS(machine):
         '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.*'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 480b778045..8a2cfe5eaf 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-week'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 0
@@ -20,14 +20,14 @@ def run_TS(machine):
         '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.*'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 74b71f19d9..0e899826bf 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-week'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 0
@@ -20,14 +20,14 @@ def run_TS(machine):
         '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.*'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 41465e1b15..994a5cd341 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-week'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 0
@@ -20,14 +20,14 @@ def run_TS(machine):
         '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.*'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index dfba8fb4fb..539d683b1b 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-week'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 0
@@ -20,14 +20,14 @@ def run_TS(machine):
         '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.*'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 7dbe698ac6..2bb211f3b2 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 6f60a72d7e..321a1166d1 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 04d17559f3..73eb333889 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index f5f5bfa5f3..9d4af2ca9c 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 175abcef7d..336fbdc6c4 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 652c60f2c3..a50226fbfb 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 44a14309f1..84e4b9cdcf 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 480caf099d..97b7994c14 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 10f5d1cae7..f32e4804e8 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 06bc83c1da..5f847be691 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 04c456d9af..7ba2d28cfe 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 85ce26fb13..969630c0f6 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index b46f4a24a7..f5374c4f10 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 86ed14335f..09e1cba3c1 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 3609ad1d72..e89f29640c 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 862dfe6617..6f6039ce84 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 @@ def run_TS(machine):
         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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 3519de03e0..c9ffa494f3 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 5a59a5a213..5c541bda1f 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 472598ff30..48996b8cf1 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 39314a14ef..ff90d86cc8 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index aa175d78e6..a323d64a85 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index ea741d740c..cf119db96e 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index e8be001329..31082138fe 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 @@ def run_TS(machine):
         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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 24c9260a72..beb36afe39 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 1d6a17b903..cd740f2a8d 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index ef9e9696d4..694badf03b 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 @@ def run_TS(machine):
         '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
index 5081d0be2d..78c76bb736 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 @@ def run_TS(machine):
         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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 6e29131220..8737a98716 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 0bac3db1b1..689b031232 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 8aa7065651..2341efc35f 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 494235a81d..580d34cfa9 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 325f9442a8..7d27458237 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index d0c7bcbd52..66be459fc0 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index be9ac42fb1..dc32e80180 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index dc92dd0d04..82b87de397 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 873c0a86da..88e3b418cf 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 81dab6722d..78a1927f51 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index f69b991217..56d0607a3c 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 47e42a25bb..1099b6249f 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index ed46c63ab2..6c2301bc4f 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 @@ def run_TS(machine):
         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
index 490cc07a6e..16bd54df67 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 3a9f89586f..85da18c0e9 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 @@ def run_TS(machine):
         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
index d4c724cacc..e6cbc0deac 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 @@ def run_TS(machine):
         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
index 3405568bc2..3a012460cb 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 97a8e715d1..d32e1fed11 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 7a3ea557bb..db72b93105 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 8193199318..6872cec864 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 77e8e2a28e..e3fa716ff7 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 7b0ec1727c..5298502ec1 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 6ab086e8e0..412a89d0dd 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 7b8f69018c..b8f8642714 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index ce5a44f985..c7d6fc9ad4 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 3d460e2241..9708dcb9ef 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 @@ def run_TS(machine):
         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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 10f5081012..90d6a0b48e 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index d65d4c65ee..e6e1e8515d 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 65fd9b2d86..8114c3aef8 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 082dd52955..5c172b1723 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 @@ def run_TS(machine):
         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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index cc549192c2..1b3d32a290 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 3efd02b37d..966cb8a979 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 08964bb5cb..d82d35be5b 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index d7a5a2a263..9d3a158611 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index f9c9cb6217..4903a861df 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 79a2986d0f..e0d46edcc4 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 8a8d5515aa..5167d876a6 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 34e926e531..c32dfa13ee 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 88767843c8..2bf7799b76 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 95ca47fc79..d5375eaae1 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index a84e1946f3..73eee397db 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index a23e93408a..8f784fa200 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index cb044e06f6..1f91d36bd2 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 @@ def run_TS(machine):
         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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 2d2b4951b0..f2cc32f336 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 69e2513a6a..301114360c 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 619d7a917b..a1bbdc891e 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index ccae0b4e63..b2a7198840 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 @@ def run_TS(machine):
         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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index e1ce1ef4cb..62bf3e33a1 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 81ef2e5427..cf52345779 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index d55a7c9e54..1d48e1916b 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 @@ def run_TS(machine):
         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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 43e1c24751..bd15023390 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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',
         prerequisites=['bluetooth'],
         timeout=3600)
 
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
index a25f186051..031b9632f0 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 68e76e7c91..8253e64060 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index b664a04dcd..e5edf4e358 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 408ace4642..da091497cc 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 @@ def run_TS(machine):
         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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 1432c52d9a..2ffa83cf62 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 @@ def run_TS(machine):
         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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 3e3d7c3143..c65abdf0fb 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index d8759bc6cf..dc72dd5b2b 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,15 +21,15 @@ def run_TS(machine):
         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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='CtsTheme',
         target_plan=None,
         bundle='arm',
         extra_artifacts_host=['/tmp/diff_*.png'],
-        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',
         prerequisites=['region_us'],
         timeout=5400)
 
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
index ea483864aa..5cc7b752ef 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 64e9cb9cd7..677593fda5 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 @@ def run_TS(machine):
         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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 2280951d2a..47605c44ab 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index f3483326f8..9624365bc9 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 @@ def run_TS(machine):
         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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 7bba93441e..d5df18b489 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 @@ def run_TS(machine):
         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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index ddc8a41049..0e21bb9658 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 072e211171..ca3a16f3e3 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index f50f4658ad..331e0f0b48 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 @@ def run_TS(machine):
         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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index f5d40bf0f9..d1812c32a1 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 608cb651be..2431ed34ac 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 68119aec99..0a2fb7e214 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 3455808d31..c29f5b2d1a 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 3d2e3f0e1e..dce887ad38 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 @@ def run_TS(machine):
         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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index b0b4755e5e..207d1e8352 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 464a726b27..36755a29c1 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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',
         prerequisites=['region_us'],
         timeout=3600)
 
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
index 7734f3c4e0..17f6a01329 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 7e89b996d8..bc8df94350 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 67d845ab97..373947b5a2 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 504d197b00..fb19074dd5 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 @@ def run_TS(machine):
         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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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=5400)
 
 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
index 0132e11567..bfd98e8d7e 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 @@ def run_TS(machine):
         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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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=3600)
 
 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
index d2d11bad8e..870aebe53c 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 @@ def run_TS(machine):
         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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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=5400)
 
 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
index 2bcec81d91..ea62f7c781 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 @@ def run_TS(machine):
         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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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=10800)
 
 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
index 8e6b59b9a2..c3e5b87e18 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 @@ def run_TS(machine):
         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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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'],
         prerequisites=['region_us', 'bluetooth'],
         timeout=88200)
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
index 8156a1b7b7..da49eafa78 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 @@ def run_TS(machine):
         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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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=72000)
 
 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
index 5838557028..4b6b9f14e5 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 @@ def run_TS(machine):
         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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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=27000)
 
 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
index 4008295e81..86bbbb7dc0 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 @@ def run_TS(machine):
         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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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=10800)
 
 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
index 7f4da517b5..2a00e155de 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 @@ def run_TS(machine):
         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=61200)
 
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
index fbca807fef..0b7dc8d80a 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 @@ def run_TS(machine):
         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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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=62700)
 
 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
index e4845a79cb..4ce24eb65e 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 @@ def run_TS(machine):
         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=3600)
 
 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
index b03b4c4498..bb2b1ba3c7 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 @@ def run_TS(machine):
         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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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=3600)
 
 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
index 41affeb233..df2ab4aad0 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 @@ def run_TS(machine):
         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=18000)
 
 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
index 175ef1588b..72f21beed1 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 @@ def run_TS(machine):
         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=36000)
 
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
index 9f91ca8f95..faa59f4634 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 @@ def run_TS(machine):
         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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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=106200)
 
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
index a1732844f5..166d4625dd 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 @@ def run_TS(machine):
         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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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=3600)
 
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
index 91f10695bf..e0fe33868d 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 @@ def run_TS(machine):
         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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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=14400)
 
 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
index 92cb0690c9..582944b537 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 @@ def run_TS(machine):
         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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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=3600)
 
 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
index c4b9303836..504f673568 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,15 +21,15 @@ def run_TS(machine):
         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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='all.CtsShortcutHostTestCases_-_CtsVideoTestCases',
         target_plan=None,
         bundle='arm',
         extra_artifacts_host=['/tmp/diff_*.png'],
-        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',
         prerequisites=['bluetooth', 'region_us'],
         timeout=77400)
 
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
index 88237654eb..ed0b262d51 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 @@ def run_TS(machine):
         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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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=3600)
 
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
index f4c35029ab..814e125c75 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 @@ def run_TS(machine):
         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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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',
         prerequisites=['region_us'],
         timeout=30600)
 
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
index aff4d77dc8..5b594dbe3f 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index f156f07d7c..b5598b0b20 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index a789fa5b00..01b56f3676 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 @@ def run_TS(machine):
         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'],
         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
index ba50529f40..6b0bf6ddb4 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 4c66296988..9b8e148d97 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 8b2894cd32..d09e4d611c 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index f7dffba16c..c26a4c9fab 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index a905336c7c..7e77dbe674 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index db9097d1ad..e67e48554e 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index f4b702b977..790cc412b3 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 775de783c9..abee7de638 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 7825673e21..acc4737cb7 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 2f67da3f02..a2cb269ea7 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 16ebdc2d5c..86ae987469 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 5f91c9fd06..2757ab352c 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 61063a7939..a3b32580d6 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 @@ def run_TS(machine):
         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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 6ec63ac34b..6dca0cab7b 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 15f74a325c..30bbe26f13 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 595bb8972b..df5103fcc0 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index f93cb6824e..5773cca9cd 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index eb9f62b71b..9d4e824edb 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 7477aa5e8c..d20df13876 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 409c23afa3..669201dc39 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index a72d23c908..8580cc8152 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 23b29f5891..39166280a9 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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',
         prerequisites=['bluetooth'],
         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
index 177f3d74d9..5eb0824a78 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index d6218b048c..c980ccf832 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 8b72f078f7..f3bf0d54b0 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 6627c4b902..c4fabfd020 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 @@ def run_TS(machine):
         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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 604147a2b9..0de4cc9c32 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 @@ def run_TS(machine):
         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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 89c048f3d4..e2f48c2471 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index cb38c8792f..874c6adcd0 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 7fd151b74c..a3bef028c4 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 0828dfe89b..13286b8d26 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 228164995a..5b6abe8116 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index d618169a8d..81f2dc5f2c 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 @@ def run_TS(machine):
         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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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',
         prerequisites=['region_us'],
         timeout=3600)
 
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
index 7cf2d7f0a5..650465f79e 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 559ec71668..3951fe4996 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 592e026d6a..4ef108b834 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 7c3b001364..c9f697ea36 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index dace0d3c6f..66c60a9c87 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 @@ def run_TS(machine):
         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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index a7a284c670..8345b35722 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-week'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 0
@@ -20,14 +20,14 @@ def run_TS(machine):
         '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.*'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 6a83324e19..4371d1c676 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-week'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 0
@@ -20,14 +20,14 @@ def run_TS(machine):
         '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.*'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index c296b6ec5e..5319e0de84 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-week'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 0
@@ -20,14 +20,14 @@ def run_TS(machine):
         '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.*'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index e411d84a53..b40e1f5210 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-week'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 0
@@ -20,14 +20,14 @@ def run_TS(machine):
         '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.*'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 03288e2957..4ba4f36cd2 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-week'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 0
@@ -20,14 +20,14 @@ def run_TS(machine):
         '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.*'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index b86ff2c975..755d8e255a 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 297c109c2f..57f739717b 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index b7798d4f3f..917123b6f5 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 5613f8e6fb..10a84b3f29 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index ea1470ae3a..b94f41aec4 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index ddbff9ac66..4421d6728f 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 134b5d95dd..a7ea535f25 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 3ac0dc3dd1..379c243a04 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 86b399b8ef..281aba42f9 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 30feafcad0..db3b16bf88 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 7c6615c491..1dceb5c4c8 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index ef125fa2e9..026a12eccb 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 04c66755f8..5326e689d6 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 1f2826dc59..e4505b55b6 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 04f39fede8..b675a06385 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index a0a9a0704e..cd9fd343c6 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 130ff5add0..7f15f26d5c 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index eddcd6f76f..19630461fd 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 3854e2b4db..3dbfca39ea 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 0a5eb07790..1a6bb8708f 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index a4274ce43d..f5d65f83a4 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 5bca85c428..585eaec39e 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 9ecfcb409c..c1fa9000db 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 @@ def run_TS(machine):
         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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 4d33059da7..593f24950c 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index b185cc51c7..f2f7125af9 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index ef57b53ca6..98053c5c3e 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 @@ def run_TS(machine):
         '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
index eb348e3a83..1bdff042a3 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 757fd458a3..bb2f551675 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 4286a0601c..ce7b850f4c 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 12119c413e..62bb8f0573 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 403e85a7c5..5c28a28296 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index e1e2a464a4..e8a2a44334 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 2144af2f26..13c89ef71f 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 8b8fa4e728..e385c11449 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index b6c6db6648..fa5d8947a4 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 7c3bc1069b..f09dcb8579 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 846a3fb5a2..af344d63cd 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 2b205153b5..a7e9160656 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 77a8e0804b..24c66239c1 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 14050a474c..55acd935a7 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 @@ def run_TS(machine):
         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
index 1099ff603d..9f20027210 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 471ae4857e..f96e894a3c 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 @@ def run_TS(machine):
         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
index dc63298d2b..a97868c2a7 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 @@ def run_TS(machine):
         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
index fc27c1acd8..b235d714f7 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 11039a9b2f..8ceb74ed80 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 0ccc2a00de..6f36b8cbe9 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index afb2624d72..aab1a3fcb3 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 11271f7d80..70585b1656 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index a87ddb6ee8..a2f04e9742 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 886960c0cc..bda7797a7d 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 0f27cdf1e6..e1a0f0b27e 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 27462daf42..68aa80c84d 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 6f54d3c9e7..54d40b841f 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index d75ba1b0c8..d942745973 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 95853bf8ed..e9568f2885 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index b6420af915..58314008b5 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index dc4782bb1d..1fe7da4a9e 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 98b4c66dbf..65214d8630 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 949154ea76..54b39b8d4d 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 611c922e36..aead633880 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 4d75e28931..67c179c440 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 68228283a7..65aa8d23e5 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index b9bbeb069c..db21105372 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 76ac5ea117..a9c7363b7a 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index e79c792fd6..0066f5276f 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 4066fcebd2..a7d6133940 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 00163a917b..2f847631bb 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index cb7f70fd60..c5003fc35c 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index b01df6dbfa..3a30840e93 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 18bf26a51d..3606d40c30 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 @@ def run_TS(machine):
         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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 26df70e605..237540b6bf 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 4c332363fb..eb3d0a7075 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index f96b49805f..12e8aa5cd7 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 34d41a8589..e5c87799f3 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 7083b7282c..4daf13c11a 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index fdd39ee69d..07884eb905 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index cfa2954eac..2f1d51237a 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 1e120e57ee..a50c97d9e0 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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',
         prerequisites=['bluetooth'],
         timeout=3600)
 
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
index ebcdf270a1..88c4ae80a9 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 9f55402d84..34dda1c72d 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index b7a4eca1ba..327d95afd5 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 0ef7e81f78..5da4e6e4db 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 9f8bd8a409..a44cb70b89 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index e5f5d097ca..cf1d3e7895 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 231d23b8e6..09b70e248c 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,15 +20,15 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='CtsTheme',
         target_plan=None,
         bundle='x86',
         extra_artifacts_host=['/tmp/diff_*.png'],
-        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',
         prerequisites=['region_us'],
         timeout=5400)
 
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
index 62de34f5b8..b04cef08f0 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index f89b840ef6..18f3f1440e 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index bac7ea5877..1c0ac94209 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 29a4404e7c..06cdebc77d 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 89918f71bf..46edcce487 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 1e86654289..dd8eec2ad5 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 62ad5d635e..1293a5fc8c 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 5891670e5c..5871edadc7 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index ef659d6470..22152e7b08 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 0a851b054f..12b50c274f 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 3d5bffb047..66f0a94a16 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index a40cecbd19..b35745d9cf 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 9461622802..4d526edc9a 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index d0c8f43a1c..61d65a01ef 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 3a29c69644..b725a48ca6 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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',
         prerequisites=['region_us'],
         timeout=3600)
 
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
index 38ac6939ba..f3c28d1392 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index cdcafcbcbc..07ea588cd0 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 6113211fe0..76dab945c0 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 @@ def run_TS(machine):
         '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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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
index 1f4dea143d..e719733ff2 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 @@ def run_TS(machine):
         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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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=5400)
 
 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
index 87edf0f8a9..9b94656b29 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 @@ def run_TS(machine):
         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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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=3600)
 
 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
index 67ceefed42..a32f952927 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 @@ def run_TS(machine):
         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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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=5400)
 
 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
index 3a2b3734ba..cc052a0b9c 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 @@ def run_TS(machine):
         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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         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=10800)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases
index 3fc5db2db1..37f7f75ea7 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.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.x86.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@ def run_TS(machine):
         iterations=1,
         max_retry=9,
         enable_default_apps=True,
-        tag='9.0_r10.x86.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases',
+        tag='9.0_r11.x86.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='all.CtsAdminPackageInstallerTestCases_-_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',
         login_precondition_commands=['lsblk -do NAME,RM | sed -n s/1$//p | xargs -n1 eject'],
         prerequisites=['region_us', 'bluetooth'],
         timeout=88200)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases
index 4182a03b02..76f620fcbe 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.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.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@ def run_TS(machine):
         hosts=host_list,
         iterations=1,
         max_retry=15,
-        tag='9.0_r10.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases',
+        tag='9.0_r11.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDeqpTestCases'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='all.CtsDeqpTestCases_-_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.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases
index 5a13bdd689..a6fd11df07 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.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.x86.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@ def run_TS(machine):
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r10.x86.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases',
+        tag='9.0_r11.x86.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases',
         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=27000)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
index e47d0e8c75..433e7db5a4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.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.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@ def run_TS(machine):
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r10.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases',
+        tag='9.0_r11.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsFileSystemTestCases', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='all.CtsFileSystemTestCases_-_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.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases
index 60aea51549..1747eb4ac0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.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.x86.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@ def run_TS(machine):
         hosts=host_list,
         iterations=1,
         max_retry=30,
-        tag='9.0_r10.x86.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases',
+        tag='9.0_r11.x86.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.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='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=61200)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases
index dcfbcac9ac..480e63e944 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.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.x86.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@ def run_TS(machine):
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r10.x86.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases',
+        tag='9.0_r11.x86.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='all.CtsJvmtiAttachingHostTestCases_-_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=62700)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases
index c7d2286f25..fc2f282af0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.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.x86.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@ def run_TS(machine):
         iterations=1,
         max_retry=9,
         needs_push_media=True,
-        tag='9.0_r10.x86.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases',
+        tag='9.0_r11.x86.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.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='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.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases
index 7de0b64c42..81b02977d5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.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.x86.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@ def run_TS(machine):
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r10.x86.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases',
+        tag='9.0_r11.x86.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaHostTestCases', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='all.CtsMediaHostTestCases_-_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.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases
index c4b833da75..3b22bc87c0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.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.x86.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@ def run_TS(machine):
         iterations=1,
         max_retry=9,
         needs_push_media=True,
-        tag='9.0_r10.x86.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases',
+        tag='9.0_r11.x86.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.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='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.all.CtsMediaTestCases_-_CtsMediaTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsMediaTestCases_-_CtsMediaTestCases
index f98dc444a1..a393943142 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsMediaTestCases_-_CtsMediaTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.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.x86.all.CtsMediaTestCases_-_CtsMediaTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.all.CtsMediaTestCases_-_CtsMediaTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@ def run_TS(machine):
         iterations=1,
         max_retry=9,
         needs_push_media=True,
-        tag='9.0_r10.x86.all.CtsMediaTestCases_-_CtsMediaTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.all.CtsMediaTestCases_-_CtsMediaTestCases',
+        tag='9.0_r11.x86.all.CtsMediaTestCases_-_CtsMediaTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.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='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.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases
index 4342961080..07757dfdb2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.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.x86.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@ def run_TS(machine):
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r10.x86.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases',
+        tag='9.0_r11.x86.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases',
         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=106200)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases
index 2efc87c6d0..6d8d556b60 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.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.x86.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@ def run_TS(machine):
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r10.x86.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases',
+        tag='9.0_r11.x86.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSecurityHostTestCases', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases',
         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=3600)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases
index 733cf4f00a..b3fbd91745 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.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.x86.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@ def run_TS(machine):
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r10.x86.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases',
+        tag='9.0_r11.x86.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecurityTestCases', '--include-filter', 'CtsSelinuxTargetSdk25TestCases', '--include-filter', 'CtsSelinuxTargetSdk27TestCases', '--include-filter', 'CtsSelinuxTargetSdkCurrentTestCases', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases',
         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=14400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsSensorTestCases_-_CtsSensorTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsSensorTestCases_-_CtsSensorTestCases
index 0a991d3dbe..3e1f258fc1 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsSensorTestCases_-_CtsSensorTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.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.x86.all.CtsSensorTestCases_-_CtsSensorTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.all.CtsSensorTestCases_-_CtsSensorTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@ def run_TS(machine):
         hosts=host_list,
         iterations=1,
         max_retry=30,
-        tag='9.0_r10.x86.all.CtsSensorTestCases_-_CtsSensorTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.all.CtsSensorTestCases_-_CtsSensorTestCases',
+        tag='9.0_r11.x86.all.CtsSensorTestCases_-_CtsSensorTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.all.CtsSensorTestCases_-_CtsSensorTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSensorTestCases', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='all.CtsSensorTestCases_-_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.all.CtsShortcutHostTestCases_-_CtsVideoTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsShortcutHostTestCases_-_CtsVideoTestCases
index d9c7f31968..ded8bae53b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsShortcutHostTestCases_-_CtsVideoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.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.x86.all.CtsShortcutHostTestCases_-_CtsVideoTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.all.CtsShortcutHostTestCases_-_CtsVideoTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,15 +21,15 @@ def run_TS(machine):
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r10.x86.all.CtsShortcutHostTestCases_-_CtsVideoTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.all.CtsShortcutHostTestCases_-_CtsVideoTestCases',
+        tag='9.0_r11.x86.all.CtsShortcutHostTestCases_-_CtsVideoTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='all.CtsShortcutHostTestCases_-_CtsVideoTestCases',
         target_plan=None,
         bundle='x86',
         extra_artifacts_host=['/tmp/diff_*.png'],
-        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',
         prerequisites=['bluetooth', 'region_us'],
         timeout=77400)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsViewTestCases_-_CtsViewTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsViewTestCases_-_CtsViewTestCases
index c802084239..7e47984da4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsViewTestCases_-_CtsViewTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.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.x86.all.CtsViewTestCases_-_CtsViewTestCases'
+NAME = 'cheets_CTS_P.9.0_r11.x86.all.CtsViewTestCases_-_CtsViewTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,15 +21,15 @@ def run_TS(machine):
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r10.x86.all.CtsViewTestCases_-_CtsViewTestCases',
-        test_name='cheets_CTS_P.9.0_r10.x86.all.CtsViewTestCases_-_CtsViewTestCases',
+        tag='9.0_r11.x86.all.CtsViewTestCases_-_CtsViewTestCases',
+        test_name='cheets_CTS_P.9.0_r11.x86.all.CtsViewTestCases_-_CtsViewTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsViewTestCases', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='all.CtsViewTestCases_-_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.all.CtsVmTestCases_-_vm-tests-tf b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsVmTestCases_-_vm-tests-tf
index b0178e9e42..9b7fe44cc2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsVmTestCases_-_vm-tests-tf
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.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.x86.all.CtsVmTestCases_-_vm-tests-tf'
+NAME = 'cheets_CTS_P.9.0_r11.x86.all.CtsVmTestCases_-_vm-tests-tf'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@ def run_TS(machine):
         hosts=host_list,
         iterations=1,
         max_retry=9,
-        tag='9.0_r10.x86.all.CtsVmTestCases_-_vm-tests-tf',
-        test_name='cheets_CTS_P.9.0_r10.x86.all.CtsVmTestCases_-_vm-tests-tf',
+        tag='9.0_r11.x86.all.CtsVmTestCases_-_vm-tests-tf',
+        test_name='cheets_CTS_P.9.0_r11.x86.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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='all.CtsVmTestCases_-_vm-tests-tf',
         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',
         prerequisites=['region_us'],
         timeout=30600)
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.cts-system-all.api b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.cts-system-all.api
index 964e2505d5..62c31e1614 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.cts-system-all.api
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.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.x86.cts-system-all.api'
+NAME = 'cheets_CTS_P.9.0_r11.x86.cts-system-all.api'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@ def run_TS(machine):
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.cts-system-all.api',
-        test_name='cheets_CTS_P.9.0_r10.x86.cts-system-all.api',
+        tag='9.0_r11.x86.cts-system-all.api',
+        test_name='cheets_CTS_P.9.0_r11.x86.cts-system-all.api',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'cts-system-all.api', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='cts-system-all.api',
         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.signed-CtsSecureElementAccessControl b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.signed-CtsSecureElementAccessControl
index c4f7673218..ff99b0761a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.signed-CtsSecureElementAccessControl
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.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.x86.signed-CtsSecureElementAccessControl'
+NAME = 'cheets_CTS_P.9.0_r11.x86.signed-CtsSecureElementAccessControl'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@ def run_TS(machine):
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.signed-CtsSecureElementAccessControl',
-        test_name='cheets_CTS_P.9.0_r10.x86.signed-CtsSecureElementAccessControl',
+        tag='9.0_r11.x86.signed-CtsSecureElementAccessControl',
+        test_name='cheets_CTS_P.9.0_r11.x86.signed-CtsSecureElementAccessControl',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases1', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases2', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases3', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='signed-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.tradefed-run-collect-tests-only-internal b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.tradefed-run-collect-tests-only-internal
index bdc518a6e4..7bd7e9b555 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.tradefed-run-collect-tests-only-internal
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.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.x86.tradefed-run-collect-tests-only-internal'
+NAME = 'cheets_CTS_P.9.0_r11.x86.tradefed-run-collect-tests-only-internal'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 0
@@ -21,14 +21,14 @@ def run_TS(machine):
         hosts=host_list,
         iterations=1,
         max_retry=0,
-        tag='9.0_r10.x86.tradefed-run-collect-tests-only-internal',
-        test_name='cheets_CTS_P.9.0_r10.x86.tradefed-run-collect-tests-only-internal',
+        tag='9.0_r11.x86.tradefed-run-collect-tests-only-internal',
+        test_name='cheets_CTS_P.9.0_r11.x86.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'],
         retry_template=None,
         target_module=None,
         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.vm-tests-tf b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.vm-tests-tf
index 162789ffa9..2881813c29 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.vm-tests-tf
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.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.x86.vm-tests-tf'
+NAME = 'cheets_CTS_P.9.0_r11.x86.vm-tests-tf'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@ def run_TS(machine):
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.vm-tests-tf',
-        test_name='cheets_CTS_P.9.0_r10.x86.vm-tests-tf',
+        tag='9.0_r11.x86.vm-tests-tf',
+        test_name='cheets_CTS_P.9.0_r11.x86.vm-tests-tf',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'vm-tests-tf', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='vm-tests-tf',
         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.wm-presubmit b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.wm-presubmit
index 49e7954d14..78ad80e673 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.wm-presubmit
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.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.x86.wm-presubmit'
+NAME = 'cheets_CTS_P.9.0_r11.x86.wm-presubmit'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -20,14 +20,14 @@ def run_TS(machine):
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        tag='9.0_r10.x86.wm-presubmit',
-        test_name='cheets_CTS_P.9.0_r10.x86.wm-presubmit',
+        tag='9.0_r11.x86.wm-presubmit',
+        test_name='cheets_CTS_P.9.0_r11.x86.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'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='wm-presubmit',
         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=720)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.tradefed-run-test b/server/site_tests/cheets_CTS_P/control.tradefed-run-test
index 688d1b543e..4cc728fad4 100644
--- a/server/site_tests/cheets_CTS_P/control.tradefed-run-test
+++ b/server/site_tests/cheets_CTS_P/control.tradefed-run-test
@@ -31,7 +31,7 @@ logging.info(
 cts_abi = 'arm'
 cts_module = ''
 cts_retry = 5
-cts_revision = '9.0_r10'  # TODO(ihf): Set this default value from generator.
+cts_revision = '9.0_r11'  # TODO(ihf): Set this default value from generator.
 cts_test = ''
 cts_timeout = 600
 
diff --git a/server/site_tests/cheets_CTS_P/subplans/waivers.xml b/server/site_tests/cheets_CTS_P/subplans/waivers.xml
index 2ea6d0771a..4ffbae3ff4 100644
--- a/server/site_tests/cheets_CTS_P/subplans/waivers.xml
+++ b/server/site_tests/cheets_CTS_P/subplans/waivers.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no' ?>
 <SubPlan version="2.0">
-  <Entry include="CtsBionicTestCases pthread_leak#detach" />
   <Entry include="CtsIncidentHostTestCases com.android.server.cts.GraphicsStatsValidationTest#testBasicDrawFrame"/>
   <Entry include="CtsIncidentHostTestCases com.android.server.cts.GraphicsStatsValidationTest#testDaveyDrawFrame"/>
   <Entry include="CtsIncidentHostTestCases com.android.server.cts.GraphicsStatsValidationTest#testJankyDrawFrame"/>
@@ -8,5 +7,4 @@
   <Entry include="CtsViewTestCases android.view.cts.PixelCopyTest#testDialogProducerCopyToRGBA16F" />
   <Entry include="CtsViewTestCases android.view.cts.PixelCopyTest#testWindowProducer" />
   <Entry include="CtsViewTestCases android.view.cts.PixelCopyTest#testWindowProducerCopyToRGBA16F" />
-  <Entry include="CtsViewTestCases android.view.cts.ViewTest#testTouchMode" />
 </SubPlan>
diff --git a/server/site_tests/cheets_GTS/notest_modules/notest_modules.yaml b/server/site_tests/cheets_GTS/notest_modules/notest_modules.yaml
index 002631c565..ccc5b253cd 100644
--- a/server/site_tests/cheets_GTS/notest_modules/notest_modules.yaml
+++ b/server/site_tests/cheets_GTS/notest_modules/notest_modules.yaml
@@ -1,8 +1,6 @@
 GtsAccountsHostTestCases: [all]
 GtsAngleHostTestCases: [all]
-GtsArtManagerHostTestCases: [N]
 GtsAssistantHostTestCases: [all]
-GtsContentTestCases: [N]
 GtsDeviceConfigTestCases: [all]
 GtsDexModuleRegistrationTestCases: [all]
 GtsDialerDeviceTestCases: [all]
@@ -13,13 +11,9 @@ GtsMemory: [all]
 GtsMemoryHostTestCases: [all]
 GtsMemoryTestCases: [all]
 GtsModuleMetadataTestCases: [all]
-GtsNetStatsHostTestCases: [N]
 GtsNetworkStackHostTestCases: [all]
-GtsNoPermission: [N]
-GtsNoPermissionTestCases: [N]
-GtsNoPermissionTestCases25: [N]
 GtsOemLockServiceTestCases: [all]
-GtsPackageUninstallTestCases: [N]
+GtsPermissionControllerHostTestCases: [all]
 GtsSample: [all]
 GtsSampleDeviceTestCases: [all]
 GtsSampleDynamicConfigTestCases: [all]
@@ -30,13 +24,9 @@ GtsSmartBatteryDeviceTestCases: [all]
 GtsStagedInstallHostTestCases: [all]
 GtsStorageTestCases: [all]
 GtsSupervisionTestCases: [all]
-GtsSuspendApps: [N]
-GtsSuspendAppsPermissionTestCases: [N]
 GtsSuspendAppsTestCases: [all]
 GtsTestHarnessModeTestCases: [all]
 GtsTvTestCases: [all]
-GtsUsageStatsTestCases: [N]
-GtsWellbeing: [N]
-GtsWellbeingPermissionPolicyTestCases: [N]
 GtsWellbeingHostTestCases: [all]
 GtsWellbeingTestCases: [all]
+ReviewPermissionHelperGts: [all]
diff --git a/client/site_tests/dummy_SynchronousOffload/control.server b/server/site_tests/dummy_SynchronousOffloadServer/control
index c9012da48f..4cc9d1b533 100644
--- a/client/site_tests/dummy_SynchronousOffload/control.server
+++ b/server/site_tests/dummy_SynchronousOffloadServer/control
@@ -1,9 +1,9 @@
-# Copyright (c) 2020 The Chromium OS Authors. All rights reserved.
+# Copyright 2020 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 AUTHOR = "jkop@google.com"
-NAME = "dummy_SynchronousOffload.server"
+NAME = "dummy_SynchronousOffloadServer"
 PURPOSE = "Verify tests can offload output from servers."
 TIME = "SHORT"
 TEST_CATEGORY = "General"
@@ -12,7 +12,11 @@ TEST_TYPE = "server"
 
 DOC = """
 This test creates a file in $SYNCHRONOUS_OFFLOAD_DIR on the server and succeeds.
-The task will fail only if the offload of that file fails.
+The task will fail only if the creation or offload of that file fails.
 """
 
-job.run_test('dummy_SynchronousOffload')
+def run(machine):
+    job.run_test('dummy_SynchronousOffloadServer',
+                 host=hosts.create_host(machine))
+
+parallel_simple(run, machines)
diff --git a/server/site_tests/dummy_SynchronousOffloadServer/dummy_SynchronousOffloadServer.py b/server/site_tests/dummy_SynchronousOffloadServer/dummy_SynchronousOffloadServer.py
new file mode 100644
index 0000000000..e6e83a70b8
--- /dev/null
+++ b/server/site_tests/dummy_SynchronousOffloadServer/dummy_SynchronousOffloadServer.py
@@ -0,0 +1,20 @@
+# Copyright 2020 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import logging
+import os
+
+from autotest_lib.client.bin import test
+from autotest_lib.client.common_lib import error
+
+class dummy_SynchronousOffloadServer(test.test):
+  version = 1
+
+  def run_once(self):
+    DIR = os.getenv('SYNCHRONOUS_OFFLOAD_DIR')
+    if DIR == "":
+      raise error.TestFail("Did not find value for SYNCHRONOUS_OFFLOAD_DIR")
+    with open(os.path.join(DIR,"test_file"), "w") as f:
+      f.write("Test string which should be offloaded")
+      logging.debug("Wrote string to test file.")
diff --git a/server/site_tests/firmware_Cr50RddG3/control b/server/site_tests/firmware_Cr50RddG3/control
index 0c4bb6d6fe..0b266fcd37 100644
--- a/server/site_tests/firmware_Cr50RddG3/control
+++ b/server/site_tests/firmware_Cr50RddG3/control
@@ -12,11 +12,11 @@ TIME = "SHORT"
 TEST_TYPE = "server"
 DEPENDENCIES = "servo"
 
-DOC = """Verify Rdd in G3.
+DOC = """Verify Rdd connect and disconnect in G3.
 
-Some boards always detect Rdd is connected when the EC is in hibernate. Add a
-test to detect this, so we know the behavior of current boards and we can
-prevent new boards from being released with this issue.
+Rdd may break when entering G3. This test verifies the behavior of the DUT.
+Add the information to the faft config so other tests can act appropriately or
+fix the hardware, so Rdd isn't broken.
 """
 
 if 'args_dict' not in locals():
diff --git a/server/site_tests/firmware_Cr50RddG3/firmware_Cr50RddG3.py b/server/site_tests/firmware_Cr50RddG3/firmware_Cr50RddG3.py
index fcf1022e5a..6e778fd4a5 100644
--- a/server/site_tests/firmware_Cr50RddG3/firmware_Cr50RddG3.py
+++ b/server/site_tests/firmware_Cr50RddG3/firmware_Cr50RddG3.py
@@ -2,6 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import logging
 import time
 
 from autotest_lib.client.common_lib import error
@@ -9,42 +10,90 @@ from autotest_lib.server.cros.faft.cr50_test import Cr50Test
 
 
 class firmware_Cr50RddG3(Cr50Test):
-    """Verify Rdd in G3."""
+    """Verify Rdd connect and disconnect in G3."""
     version = 1
 
     WAIT_FOR_STATE = 10
+    # Cr50 debounces disconnects. We need to wait before checking Rdd state
+    RDD_DEBOUNCE = 3
 
     def rdd_is_connected(self):
         """Return True if Cr50 detects Rdd."""
         time.sleep(2)
         return self.cr50.get_ccdstate()['Rdd'] == 'connected'
 
+
+    def check_rdd_status(self, dts_mode, err_desc, capability=''):
+        """Check the rdd state.
+
+        @param dts_mode: 'on' if Rdd should be connected. 'off' if it should be
+                         disconnected.
+        @param err_desc: Description of the rdd error.
+        @param capability: ignore err_desc if this capability string is found in
+                           the faft board config.
+        @param raises TestFail if rdd state doesn't match the expected rdd state
+                      or if it does and the board has the capability set.
+        """
+        time.sleep(self.RDD_DEBOUNCE)
+        err_msg = None
+        rdd_enabled = self.rdd_is_connected()
+        logging.info('dts: %r rdd: %r', dts_mode,
+                     'connected' if rdd_enabled else 'disconnected')
+        has_cap = capability and self.check_cr50_capability([capability])
+        if rdd_enabled != (dts_mode == 'on'):
+            if has_cap:
+                logging.info('Found %r. %r still applies to board.', capability,
+                             err_desc)
+            else:
+                err_msg = err_desc
+        elif has_cap:
+            err_msg = 'Found %r, but %r did not occur.' % (capability, err_desc)
+        if err_msg:
+            logging.warning(err_msg)
+            self.rdd_failures.append(err_msg)
+
+
     def run_once(self):
         """Verify Rdd in G3."""
+        self.rdd_failures = []
         if not hasattr(self, 'ec'):
             raise error.TestNAError('Board does not have an EC.')
-        if self.check_cr50_capability(['rdd_leakage']):
-            raise error.TestNAError('Leakage on the rdd signals breaks '
-                                    'detection in G3')
 
         self.servo.set_dts_mode('on')
-        if not self.rdd_is_connected():
-            raise error.TestNAError('Cr50 does not detect Rdd with dts mode on')
+        self.check_rdd_status('on', 'Cr50 did not detect Rdd with dts mode on')
 
         self.servo.set_dts_mode('off')
+        self.check_rdd_status('off', 'Cr50 did not detect Rdd disconnect in S0')
 
-        if self.rdd_is_connected():
-            raise error.TestFail('Cr50 detects Rdd with dts mode off')
-
+        logging.info('Checking Rdd is disconnected with the EC in hibernate')
         self.faft_client.system.run_shell_command('poweroff')
         time.sleep(self.WAIT_FOR_STATE)
         self.ec.send_command('hibernate')
-
         time.sleep(self.WAIT_FOR_STATE)
-        rdd_connected = self.rdd_is_connected()
 
+        self.check_rdd_status('off', 'Rdd connected after EC hibernate',
+                              'rdd_leakage')
+
+        logging.info('Checking Rdd can be connected in G3.')
         self.servo.set_dts_mode('on')
+        self.check_rdd_status('on', 'Cr50 did not detect Rdd connect in G3')
+
+        # Turn the DUT on, then reenter G3 to make sure the system handles Rdd
+        # while entering G3 ok.
         self._try_to_bring_dut_up()
+        self.check_rdd_status('on', 'Rdd disconnected entering S0')
 
-        if rdd_connected:
-            raise error.TestFail('Rdd is broken in G3')
+        logging.info('Checking Rdd is connected with the EC in hibernate.')
+        self.faft_client.system.run_shell_command('poweroff')
+        time.sleep(self.WAIT_FOR_STATE)
+        self.ec.send_command('hibernate')
+        time.sleep(self.WAIT_FOR_STATE)
+
+        self.check_rdd_status('on', 'Rdd disconnected after EC hibernate')
+
+        logging.info('Checking Rdd can be disconnected in G3.')
+        self.servo.set_dts_mode('off')
+        self.check_rdd_status('off', 'Cr50 did not detect Rdd disconnect in G3')
+        self._try_to_bring_dut_up()
+        if self.rdd_failures:
+            raise error.TestFail('Found Rdd issues: %s' % (self.rdd_failures))
diff --git a/server/site_tests/firmware_Cr50WPG3/firmware_Cr50WPG3.py b/server/site_tests/firmware_Cr50WPG3/firmware_Cr50WPG3.py
index 38ae985081..e331eb2fb3 100644
--- a/server/site_tests/firmware_Cr50WPG3/firmware_Cr50WPG3.py
+++ b/server/site_tests/firmware_Cr50WPG3/firmware_Cr50WPG3.py
@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 import logging
+import re
 import time
 
 from autotest_lib.client.common_lib import error
@@ -14,9 +15,15 @@ class firmware_Cr50WPG3(Cr50Test):
     version = 1
 
     WAIT_FOR_STATE = 10
+    WP_REGEX = r'write protect is ((en|dis)abled)\.'
+    FLASHROM_WP_CMD = ('sudo flashrom -p raiden_debug_spi:target=AP,serial=%s '
+                       '--wp-status')
 
     def cleanup(self):
         """Reenable servo wp."""
+        self.cr50.send_command('rddkeepalive disable')
+        self.cr50.send_command('ccdblock IGNORE_SERVO disable')
+        self.servo.enable_main_servo_device()
         try:
             if hasattr(self, '_start_fw_wp_vref'):
                 self.servo.set_nocheck('fw_wp_state', self._start_fw_wp_state)
@@ -25,29 +32,59 @@ class firmware_Cr50WPG3(Cr50Test):
             super(firmware_Cr50WPG3, self).cleanup()
 
 
+    def generate_flashrom_wp_cmd(self):
+        """Use the cr50 serialname to generate the flashrom command."""
+        devid = self.servo.get('cr50_devid')
+        serial = devid.replace('0x', '').replace(' ', '-').upper()
+        logging.info('CCD serial: %s', serial)
+        self._flashrom_wp_cmd = self.FLASHROM_WP_CMD % serial
+
+
+    def get_wp_state(self):
+        """Returns 'on' if write protect is enabled. 'off' if it's disabled."""
+        flashrom_output = self.servo.system_output(self._flashrom_wp_cmd)
+        match = re.search(self.WP_REGEX, flashrom_output)
+        logging.info('WP is %s', match.group(1) if match else 'UKNOWN')
+        logging.debug('flashrom output\n%s', flashrom_output)
+        if not match:
+            raise error.TestError('Unable to find WP status in flashrom output')
+        return match.group(1)
+
+
     def run_once(self):
         """Verify WP in G3."""
         if self.check_cr50_capability(['wp_on_in_g3'], suppress_warning=True):
             raise error.TestNAError('WP not pulled up in G3')
-        if self.servo.main_device_is_ccd():
-            raise error.TestNAError('Need servo flex to check WP')
+        if not self.servo.dts_mode_is_valid():
+            raise error.TestNAError('Type-C servo v4 required to check wp.')
+        try:
+            self.cr50.ccd_enable(True)
+        except:
+            raise error.TestNAError('CCD required to check wp.')
+        self.generate_flashrom_wp_cmd()
 
         self.fast_open(True)
+        # faft-cr50 runs with servo micro and type c servo v4. Use ccdblock to
+        # get cr50 to ignore the fact servo is connected and allow the test to
+        # use ccd to check wp status.
+        self.cr50.send_command('ccdblock IGNORE_SERVO enable')
+        self.cr50.send_command('rddkeepalive enable')
+        self.cr50.get_ccdstate()
 
-        self._start_fw_wp_state = self.servo.get('fw_wp_state')
-        self._start_fw_wp_vref = self.servo.get('fw_wp_vref')
-        # Stop forcing wp using servo, so we can set it with ccd.
-        self.servo.set_nocheck('fw_wp_state', 'reset')
-        self.servo.set_nocheck('fw_wp_vref', 'off')
+        if self.servo.main_device_is_flex():
+            self._start_fw_wp_state = self.servo.get('fw_wp_state')
+            self._start_fw_wp_vref = self.servo.get('fw_wp_vref')
+            # Stop forcing wp using servo, so we can set it with ccd.
+            self.servo.set_nocheck('fw_wp_state', 'reset')
+            self.servo.set_nocheck('fw_wp_vref', 'off')
 
         # disable write protect
         self.cr50.send_command('wp disable atboot')
 
         # Verify we can see it's disabled. This should always work. If it
         # doesn't, it may be a setup issue.
-        servo_wp_s0 = self.servo.get('fw_wp_state')
-        logging.info('servo wp: %s', servo_wp_s0)
-        if servo_wp_s0 != 'off':
+        servo_wp_s0 = self.get_wp_state()
+        if servo_wp_s0 == 'enabled':
             raise error.TestError("WP isn't disabled in S0")
 
         self.faft_client.system.run_shell_command('poweroff')
@@ -56,10 +93,9 @@ class firmware_Cr50WPG3(Cr50Test):
             self.ec.send_command('hibernate')
             time.sleep(self.WAIT_FOR_STATE)
 
-        servo_wp_g3 = self.servo.get('fw_wp_state')
-        logging.info('servo wp: %s', servo_wp_g3)
+        servo_wp_g3 = self.get_wp_state()
         self._try_to_bring_dut_up()
         # Some boards don't power the EC_WP signal in G3, so it can't be
         # disabled by cr50 in G3.
-        if servo_wp_g3 != 'off':
+        if servo_wp_g3 == 'enabled':
             raise error.TestFail("WP can't be disabled by Cr50 in G3")
diff --git a/server/site_tests/firmware_FAFTModeTransitions/control.all_single b/server/site_tests/firmware_FAFTModeTransitions/control.all_single
new file mode 100644
index 0000000000..33069ee6e4
--- /dev/null
+++ b/server/site_tests/firmware_FAFTModeTransitions/control.all_single
@@ -0,0 +1,40 @@
+# Copyright (c) 2020 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+from autotest_lib.server import utils
+
+AUTHOR = "aluo"
+NAME = "firmware_FAFTModeTransitions.all_single"
+PURPOSE = "Test FAFT ability to switch between different modes"
+CRITERIA = "This test will fail if FAFT can not switch between any two modes."
+ATTRIBUTES = "suite:faft_framework"
+TIME = "MEDIUM"
+TEST_CATEGORY = "Functional"
+TEST_CLASS = "firmware"
+TEST_TYPE = "server"
+JOB_RETRIES = 4
+
+DOC = """
+This test checks the following mode transitions:
+  - Transition between any two modes (single transition)
+"""
+
+args_dict = utils.args_to_dict(args)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
+
+
+def run_faftmodetransitions(machine):
+    host = hosts.create_host(machine, servo_args=servo_args)
+
+    job.run_test(
+            "firmware_FAFTModeTransitions",
+            host=host,
+            cmdline_args=args,
+            disable_sysinfo=True,
+            mode_seq=[
+                    "normal", "dev", "rec", "normal", "rec", "dev", "normal"
+            ])
+
+
+parallel_simple(run_faftmodetransitions, machines)
diff --git a/server/site_tests/firmware_FAFTModeTransitions/control.dev_u b/server/site_tests/firmware_FAFTModeTransitions/control.dev_u
new file mode 100644
index 0000000000..42815f067b
--- /dev/null
+++ b/server/site_tests/firmware_FAFTModeTransitions/control.dev_u
@@ -0,0 +1,39 @@
+# Copyright (c) 2020 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+from autotest_lib.server import utils
+
+AUTHOR = "aluo"
+NAME = "firmware_FAFTModeTransitions.dev_u"
+PURPOSE = "Test FAFT ability to switch from dev to another mode and back"
+CRITERIA = "This test will fail if FAFT can not switch from dev and back again."
+# TODO(https://crbug.com/1052549): Add to faft_framework suite.
+TIME = "MEDIUM"
+TEST_CATEGORY = "Functional"
+TEST_CLASS = "firmware"
+TEST_TYPE = "server"
+JOB_RETRIES = 4
+
+DOC = """
+This test checks the following mode transitions:
+  - Transition from dev to normal and back.
+  - Transition from dev to rec and back.
+"""
+
+args_dict = utils.args_to_dict(args)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
+
+
+def run_faftmodetransitions(machine):
+    host = hosts.create_host(machine, servo_args=servo_args)
+
+    job.run_test(
+            "firmware_FAFTModeTransitions",
+            host=host,
+            cmdline_args=args,
+            disable_sysinfo=True,
+            mode_seq=["dev", "normal", "dev", "rec", "dev"])
+
+
+parallel_simple(run_faftmodetransitions, machines)
diff --git a/server/site_tests/firmware_FAFTModeTransitions/control.normal_u b/server/site_tests/firmware_FAFTModeTransitions/control.normal_u
new file mode 100644
index 0000000000..e0fa2c9c0d
--- /dev/null
+++ b/server/site_tests/firmware_FAFTModeTransitions/control.normal_u
@@ -0,0 +1,39 @@
+# Copyright (c) 2020 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+from autotest_lib.server import utils
+
+AUTHOR = "aluo"
+NAME = "firmware_FAFTModeTransitions.normal_u"
+PURPOSE = "Test FAFT ability to switch from normal to another mode and back"
+CRITERIA = "This test will fail if FAFT can not switch from normal and back again."
+ATTRIBUTES = "suite:faft_framework"
+TIME = "MEDIUM"
+TEST_CATEGORY = "Functional"
+TEST_CLASS = "firmware"
+TEST_TYPE = "server"
+JOB_RETRIES = 4
+
+DOC = """
+This test checks the following mode transitions:
+  - Transition from normal to dev and back.
+  - Transition from normal to rec and back.
+"""
+
+args_dict = utils.args_to_dict(args)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
+
+
+def run_faftmodetransitions(machine):
+    host = hosts.create_host(machine, servo_args=servo_args)
+
+    job.run_test(
+            "firmware_FAFTModeTransitions",
+            host=host,
+            cmdline_args=args,
+            disable_sysinfo=True,
+            mode_seq=["normal", "dev", "normal", "rec", "normal"])
+
+
+parallel_simple(run_faftmodetransitions, machines)
diff --git a/server/site_tests/firmware_FAFTModeTransitions/control.rec_u b/server/site_tests/firmware_FAFTModeTransitions/control.rec_u
new file mode 100644
index 0000000000..b433840aa7
--- /dev/null
+++ b/server/site_tests/firmware_FAFTModeTransitions/control.rec_u
@@ -0,0 +1,39 @@
+# Copyright (c) 2020 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+from autotest_lib.server import utils
+
+AUTHOR = "aluo"
+NAME = "firmware_FAFTModeTransitions.rec_u"
+PURPOSE = "Test FAFT ability to switch from rec to another mode and back"
+CRITERIA = "This test will fail if FAFT can not switch from rec and back again."
+ATTRIBUTES = "suite:faft_framework"
+TIME = "MEDIUM"
+TEST_CATEGORY = "Functional"
+TEST_CLASS = "firmware"
+TEST_TYPE = "server"
+JOB_RETRIES = 4
+
+DOC = """
+This test checks the following mode transitions:
+  - Transition from rec to normal and back.
+  - Transition from rec to dev and back.
+"""
+
+args_dict = utils.args_to_dict(args)
+servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
+
+
+def run_faftmodetransitions(machine):
+    host = hosts.create_host(machine, servo_args=servo_args)
+
+    job.run_test(
+            "firmware_FAFTModeTransitions",
+            host=host,
+            cmdline_args=args,
+            disable_sysinfo=True,
+            mode_seq=["rec", "normal", "rec", "dev", "rec"])
+
+
+parallel_simple(run_faftmodetransitions, machines)
diff --git a/server/site_tests/firmware_FAFTModeTransitions/firmware_FAFTModeTransitions.py b/server/site_tests/firmware_FAFTModeTransitions/firmware_FAFTModeTransitions.py
new file mode 100644
index 0000000000..380b24db84
--- /dev/null
+++ b/server/site_tests/firmware_FAFTModeTransitions/firmware_FAFTModeTransitions.py
@@ -0,0 +1,48 @@
+# Copyright (c) 2020 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import logging
+
+from autotest_lib.client.common_lib import common
+from autotest_lib.server.cros.faft.firmware_test import FirmwareTest
+
+
+class firmware_FAFTModeTransitions(FirmwareTest):
+    """This test checks FAFT mode transitions work."""
+    version = 1
+
+    def _checked_reboot(self, to_mode):
+        """Reboots DUT to mode and sanity checks that it has done so.
+
+        @param to_mode: mode_switcher mode to reboot into
+        @type to_mode: string
+
+        @see: autotest_lib.server.cros.faft.utils.mode_switcher
+        """
+        self.switcher.reboot_to_mode(to_mode)
+        self.check_state((self.checkers.mode_checker, to_mode))
+
+    def run_once(self, mode_seq=[]):
+        """Main test logic.
+
+        @param mode_seq: A list of mode_switcher modes to transition through
+        @type mode_seq: list of strings
+
+        @see: autotest_lib.server.cros.faft.utils.mode_switcher
+        """
+
+        if len(mode_seq) < 2:
+            raise ValueError("Not enough transitions to test: %s" % mode_seq)
+
+        logging.info("Testing transition sequence: %s",  " -> ".join(mode_seq))
+
+        m1 = mode_seq[0]
+
+        logging.info("Start in %s mode.", m1)
+        self.switcher.setup_mode(m1)
+
+        for m2 in mode_seq[1:]:
+            logging.info("Checking mode transition: %s -> %s.", m1, m2)
+            self._checked_reboot(m2)
+            m1 = m2
diff --git a/server/site_tests/sequences/control.power_dashboard_full_lab b/server/site_tests/sequences/control.power_dashboard_full_lab
index 2170c176ba..7edd208461 100644
--- a/server/site_tests/sequences/control.power_dashboard_full_lab
+++ b/server/site_tests/sequences/control.power_dashboard_full_lab
@@ -8,6 +8,7 @@ TIME = "MEDIUM"
 TEST_CATEGORY = "Stress"
 TEST_CLASS = "suite"
 TEST_TYPE = "server"
+ATTRIBUTES = "suite:power_dashboard"
 
 DOC = """
 Sequence for upload common power test data to dashboard.
diff --git a/site_utils/attribute_whitelist.txt b/site_utils/attribute_whitelist.txt
index 1d58a17d27..0f35a50bc2 100644
--- a/site_utils/attribute_whitelist.txt
+++ b/site_utils/attribute_whitelist.txt
@@ -30,6 +30,7 @@ suite:arc-cts-instant-qual
 suite:arc-cts-perbuild
 suite:arc-cts-q
 suite:arc-cts-qual
+suite:arc-cts-r
 suite:arc-cts-stable
 suite:arc-cts-terra
 suite:arc-cts-test
@@ -185,6 +186,7 @@ suite:perfalerts
 suite:policy
 suite:power_build
 suite:power_daily
+suite:power_dashboard
 suite:power_idle
 suite:power_loadtest
 suite:power_loadtest_1hour
diff --git a/test_suites/control.power_dashboard b/test_suites/control.power_dashboard
new file mode 100644
index 0000000000..397962eb37
--- /dev/null
+++ b/test_suites/control.power_dashboard
@@ -0,0 +1,32 @@
+# Copyright 2020 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+AUTHOR = "puthik"
+NAME = "power_dashboard"
+TIME = "LONG"
+TEST_CATEGORY = "General"
+TEST_CLASS = "suite"
+TEST_TYPE = "Server"
+
+DOC = """
+Run Automated power tests on DUTs to upload data to power dashboard.
+
+@param build: The name of the image to test.
+              Ex: x86-mario-release/R17-1412.33.0-a1-b29
+@param board: The board to test on. Ex: x86-mario
+@param pool: The pool of machines to utilize for scheduling. If pool=None
+             board is used.
+@param check_hosts: require appropriate live hosts to exist in the lab.
+@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
+"""
+
+import common
+from autotest_lib.server.cros.dynamic_suite import dynamic_suite
+
+args_dict['max_runtime_mins'] = 720
+args_dict['add_experimental'] = True
+args_dict['name'] = NAME
+args_dict['job'] = job
+
+dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.runtime_probe_perbuild b/test_suites/control.runtime_probe_perbuild
new file mode 100644
index 0000000000..61c3d3c0bb
--- /dev/null
+++ b/test_suites/control.runtime_probe_perbuild
@@ -0,0 +1,43 @@
+# Copyright 2020 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+AUTHOR = "ckclark@chromium.org, chromeos-runtime-probe@google.com"
+NAME = "runtime_probe_perbuild"
+PURPOSE = "Runtime Probe tests"
+
+TIME = "SHORT"
+TEST_CATEGORY = "Functional"
+TEST_CLASS = "suite"
+TEST_TYPE = "Server"
+
+DOC = """
+ChromeOS Runtime Probe tests.
+
+This suite is used as an entry point for runtime_probe_perbuild, which passes
+cros labels in host info store as references to runtime probe tast tests for
+comparison with probed component names.
+"""
+
+import common
+from autotest_lib.server.cros.dynamic_suite import dynamic_suite
+
+
+# Values specified in this bug template will override default values when
+# filing bugs on tests that are a part of this suite. If left unspecified
+# the bug filer will fallback to its defaults.
+_BUG_TEMPLATE = {
+    'labels': ['Type-Bug', 'Cros-Runtime-Probe-Test'],
+    'owner': 'ckclark@chromium.org',
+    'cc': ['chromeos-runtime-probe@google.com']
+}
+
+args_dict['max_runtime_mins'] = 10
+args_dict['timeout_mins'] = 10
+args_dict['file_bugs'] = True
+args_dict['name'] = 'runtime_probe_perbuild'
+args_dict['job'] = job
+args_dict['add_experimental'] = True
+args_dict['bug_template'] = _BUG_TEMPLATE
+
+dynamic_suite.reimage_and_run(**args_dict)