diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsAadbHostTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsAadbHostTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsAadbHostTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsAadbHostTestCases
index f59285e..946e540 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsAadbHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsAadbHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsAadbHostTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsAadbHostTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsAadbHostTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsAadbHostTestCases',
+        tag='7.1_r28.arm.CtsAadbHostTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsAadbHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAadbHostTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsAadbHostTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsAbiOverrideHostTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsAbiOverrideHostTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsAbiOverrideHostTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsAbiOverrideHostTestCases
index 9c5e181..27ecd49 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsAbiOverrideHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsAbiOverrideHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsAbiOverrideHostTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsAbiOverrideHostTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsAbiOverrideHostTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsAbiOverrideHostTestCases',
+        tag='7.1_r28.arm.CtsAbiOverrideHostTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsAbiOverrideHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAbiOverrideHostTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsAbiOverrideHostTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsAccelerationTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsAccelerationTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsAccelerationTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsAccelerationTestCases
index a344598..8662528 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsAccelerationTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsAccelerationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsAccelerationTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsAccelerationTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:bvt-arc'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         iterations=1,
         max_retry=3,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsAccelerationTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsAccelerationTestCases',
+        tag='7.1_r28.arm.CtsAccelerationTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsAccelerationTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAccelerationTestCases', '--disable-reboot', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--retry', '{session_id}'],
         target_module='CtsAccelerationTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=360)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsAccessibility b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsAccessibility
similarity index 87%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsAccessibility
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsAccessibility
index 4d585e0..1cf413b 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsAccessibility
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsAccessibility
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsAccessibility'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsAccessibility'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsAccessibility',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsAccessibility',
+        tag='7.1_r28.arm.CtsAccessibility',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsAccessibility',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAccessibilityServiceTestCases', '--include-filter', 'CtsAccessibilityTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsAccessibility',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=5400)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsAccountManagerTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsAccountManagerTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsAccountManagerTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsAccountManagerTestCases
index df8276c..0054828 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsAccountManagerTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsAccountManagerTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsAccountManagerTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsAccountManagerTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:bvt-arc'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         iterations=1,
         max_retry=3,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsAccountManagerTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsAccountManagerTestCases',
+        tag='7.1_r28.arm.CtsAccountManagerTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsAccountManagerTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAccountManagerTestCases', '--disable-reboot', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--retry', '{session_id}'],
         target_module='CtsAccountManagerTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=360)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsAdminTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsAdminTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsAdminTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsAdminTestCases
index e9c7ed7..cb575a1 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsAdminTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsAdminTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsAdminTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsAdminTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsAdminTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsAdminTestCases',
+        tag='7.1_r28.arm.CtsAdminTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsAdminTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAdminTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsAdminTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsAlarmClockTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsAlarmClockTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsAlarmClockTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsAlarmClockTestCases
index 101ce63..57bd970 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsAlarmClockTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsAlarmClockTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsAlarmClockTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsAlarmClockTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsAlarmClockTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsAlarmClockTestCases',
+        tag='7.1_r28.arm.CtsAlarmClockTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsAlarmClockTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAlarmClockTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsAlarmClockTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsAndroidAppTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsAndroidAppTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsAndroidAppTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsAndroidAppTestCases
index 7784ec0..f62f3fa 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsAndroidAppTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsAndroidAppTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsAndroidAppTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsAndroidAppTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsAndroidAppTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsAndroidAppTestCases',
+        tag='7.1_r28.arm.CtsAndroidAppTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsAndroidAppTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAndroidAppTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsAndroidAppTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsAnimationTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsAnimationTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsAnimationTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsAnimationTestCases
index 8d38d95..c1bf668 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsAnimationTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsAnimationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsAnimationTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsAnimationTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsAnimationTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsAnimationTestCases',
+        tag='7.1_r28.arm.CtsAnimationTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsAnimationTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAnimationTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsAnimationTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsApp b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsApp
similarity index 90%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsApp
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsApp
index a41a880..1393d0b 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsApp
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsApp
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsApp'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsApp'
 ATTRIBUTES = 'suite:arc-cts, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -23,14 +23,14 @@
         max_retry=3,
         enable_default_apps=True,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsApp',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsApp',
+        tag='7.1_r28.arm.CtsApp',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsApp',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAppSecurityHostTestCases', '--include-filter', 'CtsAppTestCases', '--include-filter', 'CtsAppUsageHostTestCases', '--include-filter', 'CtsAppWidgetTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsApp',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         login_precondition_commands=['lsblk -do NAME,RM | sed -n s/1$//p | xargs -n1 eject'],
         timeout=12600)
 
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsAslrMallocTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsAslrMallocTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsAslrMallocTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsAslrMallocTestCases
index 9089ddf..55c5eb1 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsAslrMallocTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsAslrMallocTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsAslrMallocTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsAslrMallocTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsAslrMallocTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsAslrMallocTestCases',
+        tag='7.1_r28.arm.CtsAslrMallocTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsAslrMallocTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAslrMallocTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsAslrMallocTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsAssistTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsAssistTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsAssistTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsAssistTestCases
index 111491e..5249211 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsAssistTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsAssistTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsAssistTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsAssistTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsAssistTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsAssistTestCases',
+        tag='7.1_r28.arm.CtsAssistTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsAssistTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAssistTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsAssistTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsAtraceHostTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsAtraceHostTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsAtraceHostTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsAtraceHostTestCases
index 5aa9ae4..964bf81 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsAtraceHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsAtraceHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsAtraceHostTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsAtraceHostTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsAtraceHostTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsAtraceHostTestCases',
+        tag='7.1_r28.arm.CtsAtraceHostTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsAtraceHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAtraceHostTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsAtraceHostTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsBackup b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsBackup
similarity index 88%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsBackup
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsBackup
index 55de580..ccd5d3d 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsBackup
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsBackup
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsBackup'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsBackup'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsBackup',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsBackup',
+        tag='7.1_r28.arm.CtsBackup',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsBackup',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsBackupHostTestCases', '--include-filter', 'CtsBackupTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsBackup',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=5400)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsBionicTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsBionicTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsBionicTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsBionicTestCases
index 7bf86be..659d98f 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsBionicTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsBionicTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsBionicTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsBionicTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsBionicTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsBionicTestCases',
+        tag='7.1_r28.arm.CtsBionicTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsBionicTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsBionicTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsBionicTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsBluetoothTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsBluetoothTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsBluetoothTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsBluetoothTestCases
index 616b75e..f623ccb 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsBluetoothTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsBluetoothTestCases
@@ -7,7 +7,7 @@
 from autotest_lib.server import utils
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsBluetoothTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsBluetoothTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -25,14 +25,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsBluetoothTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsBluetoothTestCases',
+        tag='7.1_r28.arm.CtsBluetoothTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsBluetoothTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsBluetoothTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsBluetoothTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         hard_reboot_on_failure=True,
         timeout=3600)
 
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsCalendarcommon2TestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsCalendarcommon2TestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsCalendarcommon2TestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsCalendarcommon2TestCases
index e5af13a..3c5441f 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsCalendarcommon2TestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsCalendarcommon2TestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsCalendarcommon2TestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsCalendarcommon2TestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsCalendarcommon2TestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsCalendarcommon2TestCases',
+        tag='7.1_r28.arm.CtsCalendarcommon2TestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsCalendarcommon2TestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCalendarcommon2TestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsCalendarcommon2TestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsCameraTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsCameraTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsCameraTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsCameraTestCases
index 62ec0a8..3dd9617 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsCameraTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsCameraTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsCameraTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsCameraTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsCameraTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsCameraTestCases',
+        tag='7.1_r28.arm.CtsCameraTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsCameraTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsCameraTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsCameraTestCases.camerabox.back b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsCameraTestCases.camerabox.back
similarity index 85%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsCameraTestCases.camerabox.back
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsCameraTestCases.camerabox.back
index 20f8000..2641924 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsCameraTestCases.camerabox.back
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsCameraTestCases.camerabox.back
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsCameraTestCases.camerabox.back'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsCameraTestCases.camerabox.back'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc, camerabox'
 JOB_RETRIES = 1
@@ -23,14 +23,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsCameraTestCases.camerabox.back',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsCameraTestCases.camerabox.back',
+        tag='7.1_r28.arm.CtsCameraTestCases.camerabox.back',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsCameraTestCases.camerabox.back',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsCameraTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsCameraTestCases.camerabox.front b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsCameraTestCases.camerabox.front
similarity index 85%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsCameraTestCases.camerabox.front
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsCameraTestCases.camerabox.front
index fc16844..f2f037c 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsCameraTestCases.camerabox.front
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsCameraTestCases.camerabox.front
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsCameraTestCases.camerabox.front'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsCameraTestCases.camerabox.front'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc, camerabox'
 JOB_RETRIES = 1
@@ -23,14 +23,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsCameraTestCases.camerabox.front',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsCameraTestCases.camerabox.front',
+        tag='7.1_r28.arm.CtsCameraTestCases.camerabox.front',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsCameraTestCases.camerabox.front',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsCameraTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsCarTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsCarTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsCarTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsCarTestCases
index a0024b2..d7450b0 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsCarTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsCarTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsCarTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsCarTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsCarTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsCarTestCases',
+        tag='7.1_r28.arm.CtsCarTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsCarTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCarTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsCarTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsCarrierApiTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsCarrierApiTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsCarrierApiTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsCarrierApiTestCases
index fb748ef..61891e3 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsCarrierApiTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsCarrierApiTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsCarrierApiTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsCarrierApiTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsCarrierApiTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsCarrierApiTestCases',
+        tag='7.1_r28.arm.CtsCarrierApiTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsCarrierApiTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCarrierApiTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsCarrierApiTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsCompilationTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsCompilationTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsCompilationTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsCompilationTestCases
index 4b8ed31..afa0655 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsCompilationTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsCompilationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsCompilationTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsCompilationTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsCompilationTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsCompilationTestCases',
+        tag='7.1_r28.arm.CtsCompilationTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsCompilationTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCompilationTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsCompilationTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsContentTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsContentTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsContentTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsContentTestCases
index 4a5242b..3b0e31d 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsContentTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsContentTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsContentTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsContentTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsContentTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsContentTestCases',
+        tag='7.1_r28.arm.CtsContentTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsContentTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsContentTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsContentTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsCppToolsTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsCppToolsTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsCppToolsTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsCppToolsTestCases
index 2cce9f2..d1ed901 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsCppToolsTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsCppToolsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsCppToolsTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsCppToolsTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsCppToolsTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsCppToolsTestCases',
+        tag='7.1_r28.arm.CtsCppToolsTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsCppToolsTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCppToolsTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsCppToolsTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsDatabaseTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsDatabaseTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsDatabaseTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsDatabaseTestCases
index 5962486..b4c8bfb 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsDatabaseTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsDatabaseTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsDatabaseTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsDatabaseTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsDatabaseTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsDatabaseTestCases',
+        tag='7.1_r28.arm.CtsDatabaseTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsDatabaseTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDatabaseTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsDatabaseTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsDeqpTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsDeqpTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsDeqpTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsDeqpTestCases
index 73c64e4..354a1e2 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsDeqpTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsDeqpTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsDeqpTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsDeqpTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-deqp'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsDeqpTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsDeqpTestCases',
+        tag='7.1_r28.arm.CtsDeqpTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsDeqpTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--disable-reboot', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsDeqpTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=86400)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsDeqpTestCases.dEQP-EGL b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsDeqpTestCases.dEQP-EGL
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsDeqpTestCases.dEQP-EGL
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsDeqpTestCases.dEQP-EGL
index 26876ed..37a5d8a 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsDeqpTestCases.dEQP-EGL
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsDeqpTestCases.dEQP-EGL
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsDeqpTestCases.dEQP-EGL'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsDeqpTestCases.dEQP-EGL'
 ATTRIBUTES = 'suite:arc-cts-deqp, suite:graphics_per-day'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 0
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsDeqpTestCases.dEQP-EGL',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsDeqpTestCases.dEQP-EGL',
+        tag='7.1_r28.arm.CtsDeqpTestCases.dEQP-EGL',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsDeqpTestCases.dEQP-EGL',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-EGL.*', '--disable-reboot', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsDeqpTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=7200)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsDeqpTestCases.dEQP-GLES2 b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsDeqpTestCases.dEQP-GLES2
similarity index 85%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsDeqpTestCases.dEQP-GLES2
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsDeqpTestCases.dEQP-GLES2
index e85023b..ab423af 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsDeqpTestCases.dEQP-GLES2
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsDeqpTestCases.dEQP-GLES2
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsDeqpTestCases.dEQP-GLES2'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsDeqpTestCases.dEQP-GLES2'
 ATTRIBUTES = 'suite:arc-cts-deqp, suite:graphics_per-day'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 0
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsDeqpTestCases.dEQP-GLES2',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsDeqpTestCases.dEQP-GLES2',
+        tag='7.1_r28.arm.CtsDeqpTestCases.dEQP-GLES2',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsDeqpTestCases.dEQP-GLES2',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES2.*', '--disable-reboot', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsDeqpTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=7200)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsDeqpTestCases.dEQP-GLES3 b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsDeqpTestCases.dEQP-GLES3
similarity index 85%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsDeqpTestCases.dEQP-GLES3
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsDeqpTestCases.dEQP-GLES3
index 3b791f1..e426383 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsDeqpTestCases.dEQP-GLES3
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsDeqpTestCases.dEQP-GLES3
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsDeqpTestCases.dEQP-GLES3'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsDeqpTestCases.dEQP-GLES3'
 ATTRIBUTES = 'suite:arc-cts-deqp, suite:graphics_per-day'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 0
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsDeqpTestCases.dEQP-GLES3',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsDeqpTestCases.dEQP-GLES3',
+        tag='7.1_r28.arm.CtsDeqpTestCases.dEQP-GLES3',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsDeqpTestCases.dEQP-GLES3',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES3.*', '--disable-reboot', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsDeqpTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=21600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsDeqpTestCases.dEQP-GLES31 b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsDeqpTestCases.dEQP-GLES31
similarity index 85%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsDeqpTestCases.dEQP-GLES31
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsDeqpTestCases.dEQP-GLES31
index 4699b23..16b91a1 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsDeqpTestCases.dEQP-GLES31
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsDeqpTestCases.dEQP-GLES31
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsDeqpTestCases.dEQP-GLES31'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsDeqpTestCases.dEQP-GLES31'
 ATTRIBUTES = 'suite:arc-cts-deqp, suite:graphics_per-day'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 0
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsDeqpTestCases.dEQP-GLES31',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsDeqpTestCases.dEQP-GLES31',
+        tag='7.1_r28.arm.CtsDeqpTestCases.dEQP-GLES31',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsDeqpTestCases.dEQP-GLES31',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES31.*', '--disable-reboot', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsDeqpTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=43200)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsDeqpTestCases.dEQP-VK b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsDeqpTestCases.dEQP-VK
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsDeqpTestCases.dEQP-VK
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsDeqpTestCases.dEQP-VK
index 73434e3..1e5b3e6 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsDeqpTestCases.dEQP-VK
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsDeqpTestCases.dEQP-VK
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsDeqpTestCases.dEQP-VK'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsDeqpTestCases.dEQP-VK'
 ATTRIBUTES = 'suite:arc-cts-deqp, suite:graphics_per-day'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 0
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsDeqpTestCases.dEQP-VK',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsDeqpTestCases.dEQP-VK',
+        tag='7.1_r28.arm.CtsDeqpTestCases.dEQP-VK',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsDeqpTestCases.dEQP-VK',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-VK.*', '--disable-reboot', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsDeqpTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=43200)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsDevice b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsDevice
similarity index 88%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsDevice
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsDevice
index 4ec19fb..5091a24 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsDevice
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsDevice
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsDevice'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsDevice'
 ATTRIBUTES = 'suite:arc-cts, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         iterations=1,
         max_retry=3,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsDevice',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsDevice',
+        tag='7.1_r28.arm.CtsDevice',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsDevice',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeviceAdminUninstallerTestCases', '--include-filter', 'CtsDevicePolicyManagerTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsDevice',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=10800)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsDisplayTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsDisplayTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsDisplayTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsDisplayTestCases
index 9c7a5ab..cc14440 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsDisplayTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsDisplayTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsDisplayTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsDisplayTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsDisplayTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsDisplayTestCases',
+        tag='7.1_r28.arm.CtsDisplayTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsDisplayTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDisplayTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsDisplayTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsDpi b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsDpi
similarity index 88%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsDpi
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsDpi
index 895722c..97676fc 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsDpi
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsDpi
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsDpi'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsDpi'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsDpi',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsDpi',
+        tag='7.1_r28.arm.CtsDpi',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsDpi',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDpiTestCases', '--include-filter', 'CtsDpiTestCases2', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsDpi',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=5400)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsDragAndDropHostTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsDragAndDropHostTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsDragAndDropHostTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsDragAndDropHostTestCases
index de21436..d9cdf66 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsDragAndDropHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsDragAndDropHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsDragAndDropHostTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsDragAndDropHostTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsDragAndDropHostTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsDragAndDropHostTestCases',
+        tag='7.1_r28.arm.CtsDragAndDropHostTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsDragAndDropHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDragAndDropHostTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsDragAndDropHostTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsDramTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsDramTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsDramTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsDramTestCases
index 9ff5013..674b307 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsDramTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsDramTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsDramTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsDramTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:bvt-perbuild, suite:smoke'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         iterations=1,
         max_retry=3,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsDramTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsDramTestCases',
+        tag='7.1_r28.arm.CtsDramTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsDramTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDramTestCases', '--disable-reboot', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--retry', '{session_id}'],
         target_module='CtsDramTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsDreamsTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsDreamsTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsDreamsTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsDreamsTestCases
index 1fcbf14..2dae54d 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsDreamsTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsDreamsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsDreamsTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsDreamsTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsDreamsTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsDreamsTestCases',
+        tag='7.1_r28.arm.CtsDreamsTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsDreamsTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDreamsTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsDreamsTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsDrmTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsDrmTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsDrmTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsDrmTestCases
index 973ed8c..48c6c3a 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsDrmTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsDrmTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsDrmTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsDrmTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsDrmTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsDrmTestCases',
+        tag='7.1_r28.arm.CtsDrmTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsDrmTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDrmTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsDrmTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsDumpsysHostTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsDumpsysHostTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsDumpsysHostTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsDumpsysHostTestCases
index c881b69..e95b290 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsDumpsysHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsDumpsysHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsDumpsysHostTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsDumpsysHostTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsDumpsysHostTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsDumpsysHostTestCases',
+        tag='7.1_r28.arm.CtsDumpsysHostTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsDumpsysHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDumpsysHostTestCases', '--disable-reboot', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--retry', '{session_id}'],
         target_module='CtsDumpsysHostTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsEffectTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsEffectTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsEffectTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsEffectTestCases
index 9409834..c2ca4d5 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsEffectTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsEffectTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsEffectTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsEffectTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsEffectTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsEffectTestCases',
+        tag='7.1_r28.arm.CtsEffectTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsEffectTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsEffectTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsEffectTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsExternalServiceTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsExternalServiceTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsExternalServiceTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsExternalServiceTestCases
index b21ea49..1141c49 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsExternalServiceTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsExternalServiceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsExternalServiceTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsExternalServiceTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsExternalServiceTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsExternalServiceTestCases',
+        tag='7.1_r28.arm.CtsExternalServiceTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsExternalServiceTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsExternalServiceTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsExternalServiceTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsFileSystemTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsFileSystemTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsFileSystemTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsFileSystemTestCases
index 810da5d..91d3542 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsFileSystemTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsFileSystemTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsFileSystemTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsFileSystemTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsFileSystemTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsFileSystemTestCases',
+        tag='7.1_r28.arm.CtsFileSystemTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsFileSystemTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsFileSystemTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsFileSystemTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=9000)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsFragmentTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsFragmentTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsFragmentTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsFragmentTestCases
index c4dfbd3..9b54ad0 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsFragmentTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsFragmentTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsFragmentTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsFragmentTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsFragmentTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsFragmentTestCases',
+        tag='7.1_r28.arm.CtsFragmentTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsFragmentTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsFragmentTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsFragmentTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsGestureTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsGestureTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsGestureTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsGestureTestCases
index 5b54fb2..ae06eab 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsGestureTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsGestureTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsGestureTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsGestureTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsGestureTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsGestureTestCases',
+        tag='7.1_r28.arm.CtsGestureTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsGestureTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsGestureTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsGestureTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsGraphics b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsGraphics
similarity index 88%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsGraphics
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsGraphics
index dd4aae0..377e1f7 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsGraphics
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsGraphics
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsGraphics'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsGraphics'
 ATTRIBUTES = 'suite:arc-cts, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         iterations=1,
         max_retry=3,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsGraphics',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsGraphics',
+        tag='7.1_r28.arm.CtsGraphics',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsGraphics',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsGraphics2TestCases', '--include-filter', 'CtsGraphicsTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsGraphics',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=5400)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsHardwareTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsHardwareTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsHardwareTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsHardwareTestCases
index 8684f03..3c896f1 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsHardwareTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsHardwareTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsHardwareTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsHardwareTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsHardwareTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsHardwareTestCases',
+        tag='7.1_r28.arm.CtsHardwareTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsHardwareTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHardwareTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsHardwareTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=10800)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsHostside b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsHostside
similarity index 88%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsHostside
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsHostside
index 65d27fb..56839d7 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsHostside
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsHostside
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsHostside'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsHostside'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsHostside',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsHostside',
+        tag='7.1_r28.arm.CtsHostside',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsHostside',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHostsideNetworkTests', '--include-filter', 'CtsHostsideNumberBlockingTestCases', '--include-filter', 'CtsHostsideTvTests', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsHostside',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=7200)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsIcuTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsIcuTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsIcuTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsIcuTestCases
index 9e1278e..5c56a1f 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsIcuTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsIcuTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsIcuTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsIcuTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsIcuTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsIcuTestCases',
+        tag='7.1_r28.arm.CtsIcuTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsIcuTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsIcuTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsIcuTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=7200)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsJankDeviceTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsJankDeviceTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsJankDeviceTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsJankDeviceTestCases
index 606b86a..4073c74 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsJankDeviceTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsJankDeviceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsJankDeviceTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsJankDeviceTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         iterations=1,
         max_retry=3,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsJankDeviceTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsJankDeviceTestCases',
+        tag='7.1_r28.arm.CtsJankDeviceTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsJankDeviceTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJankDeviceTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsJankDeviceTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsJdwp b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsJdwp
similarity index 88%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsJdwp
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsJdwp
index de7e95b..8dcf6bf 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsJdwp
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsJdwp
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsJdwp'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsJdwp'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsJdwp',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsJdwp',
+        tag='7.1_r28.arm.CtsJdwp',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsJdwp',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJdwpSecurityHostTestCases', '--include-filter', 'CtsJdwpTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsJdwp',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=5400)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsJniTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsJniTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsJniTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsJniTestCases
index 01cf084..f6ef1fc 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsJniTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsJniTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsJniTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsJniTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsJniTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsJniTestCases',
+        tag='7.1_r28.arm.CtsJniTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsJniTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJniTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsJniTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsJobSchedulerTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsJobSchedulerTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsJobSchedulerTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsJobSchedulerTestCases
index e248399..c306a10 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsJobSchedulerTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsJobSchedulerTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsJobSchedulerTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsJobSchedulerTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsJobSchedulerTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsJobSchedulerTestCases',
+        tag='7.1_r28.arm.CtsJobSchedulerTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsJobSchedulerTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJobSchedulerTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsJobSchedulerTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-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_N/control.7.1_r27.arm.CtsKeystoreTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsKeystoreTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsKeystoreTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsKeystoreTestCases
index efa0b37..b9d6246 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsKeystoreTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsKeystoreTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsKeystoreTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsKeystoreTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsKeystoreTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsKeystoreTestCases',
+        tag='7.1_r28.arm.CtsKeystoreTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsKeystoreTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsKeystoreTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsKeystoreTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsLeanbackJankTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsLeanbackJankTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsLeanbackJankTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsLeanbackJankTestCases
index 033315e..9f6b2fb 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsLeanbackJankTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsLeanbackJankTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsLeanbackJankTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsLeanbackJankTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsLeanbackJankTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsLeanbackJankTestCases',
+        tag='7.1_r28.arm.CtsLeanbackJankTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsLeanbackJankTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLeanbackJankTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsLeanbackJankTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsLibcore b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsLibcore
similarity index 89%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsLibcore
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsLibcore
index 8320edd..1a420b9 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsLibcore
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsLibcore
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsLibcore'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsLibcore'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsLibcore',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsLibcore',
+        tag='7.1_r28.arm.CtsLibcore',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsLibcore',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLibcoreLegacy22TestCases', '--include-filter', 'CtsLibcoreOjTestCases', '--include-filter', 'CtsLibcoreOkHttpTestCases', '--include-filter', 'CtsLibcoreTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsLibcore',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=19800)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsLocation b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsLocation
similarity index 87%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsLocation
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsLocation
index d7cca99..783b036 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsLocation
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsLocation
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsLocation'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsLocation'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsLocation',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsLocation',
+        tag='7.1_r28.arm.CtsLocation',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsLocation',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLocation2TestCases', '--include-filter', 'CtsLocationTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsLocation',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=5400)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsMediaStressTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsMediaStressTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsMediaStressTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsMediaStressTestCases
index df55b6c..cedac13 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsMediaStressTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsMediaStressTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsMediaStressTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsMediaStressTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=True,
-        tag='7.1_r27.arm.CtsMediaStressTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsMediaStressTestCases',
+        tag='7.1_r28.arm.CtsMediaStressTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsMediaStressTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaStressTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsMediaStressTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=21600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsMediaTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsMediaTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsMediaTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsMediaTestCases
index 030b94d..95b9033 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsMediaTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsMediaTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsMediaTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsMediaTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsMediaTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsMediaTestCases',
+        tag='7.1_r28.arm.CtsMediaTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsMediaTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsMediaTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         login_precondition_commands=['lsblk -do NAME,RM | sed -n s/1$//p | xargs -n1 eject'],
         timeout=21600)
 
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsMidiTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsMidiTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsMidiTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsMidiTestCases
index 0a1ea94..c0d2f57 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsMidiTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsMidiTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsMidiTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsMidiTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsMidiTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsMidiTestCases',
+        tag='7.1_r28.arm.CtsMidiTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsMidiTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMidiTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsMidiTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsMonkeyTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsMonkeyTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsMonkeyTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsMonkeyTestCases
index 88aeb2d..801def1 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsMonkeyTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsMonkeyTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsMonkeyTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsMonkeyTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsMonkeyTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsMonkeyTestCases',
+        tag='7.1_r28.arm.CtsMonkeyTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsMonkeyTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMonkeyTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsMonkeyTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsMultiUser b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsMultiUser
similarity index 87%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsMultiUser
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsMultiUser
index a8dc62e..1ee372a 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsMultiUser
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsMultiUser
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsMultiUser'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsMultiUser'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsMultiUser',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsMultiUser',
+        tag='7.1_r28.arm.CtsMultiUser',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsMultiUser',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMultiUserHostTestCases', '--include-filter', 'CtsMultiUserTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsMultiUser',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=5400)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsNative b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsNative
similarity index 88%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsNative
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsNative
index 34ab879..b10433f 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsNative
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsNative
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsNative'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsNative'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsNative',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsNative',
+        tag='7.1_r28.arm.CtsNative',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsNative',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNativeMediaSlTestCases', '--include-filter', 'CtsNativeMediaXaTestCases', '--include-filter', 'CtsNativeNetTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsNative',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=7200)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsNdefTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsNdefTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsNdefTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsNdefTestCases
index ad1e401..594932d 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsNdefTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsNdefTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsNdefTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsNdefTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsNdefTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsNdefTestCases',
+        tag='7.1_r28.arm.CtsNdefTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsNdefTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNdefTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsNdefTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsNet b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsNet
similarity index 94%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsNet
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsNet
index 7d695c7..63d5b8c 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsNet
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsNet
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsNet'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsNet'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsNet',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsNet',
+        tag='7.1_r28.arm.CtsNet',
+        test_name='cheets_CTS_N.7.1_r28.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', 'CtsNetSecConfigResourcesSrcTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficFalseTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficTrueTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases', '--include-filter', 'CtsNetTestCases', '--include-filter', 'CtsNetTestCasesLegacyApi22', '--include-filter', 'CtsNetTestCasesLegacyPermission22', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsNet',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=28800)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsOpenG b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsOpenG
similarity index 89%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsOpenG
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsOpenG
index 20ccfb6..e88cd7e 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsOpenG
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsOpenG
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsOpenG'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsOpenG'
 ATTRIBUTES = 'suite:arc-cts, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         iterations=1,
         max_retry=3,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsOpenG',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsOpenG',
+        tag='7.1_r28.arm.CtsOpenG',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsOpenG',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsOpenGLTestCases', '--include-filter', 'CtsOpenGlPerf2TestCases', '--include-filter', 'CtsOpenGlPerfTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsOpenG',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=7200)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsOs b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsOs
similarity index 89%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsOs
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsOs
index faa725f..21f20c9 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsOs
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsOs
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsOs'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsOs'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsOs',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsOs',
+        tag='7.1_r28.arm.CtsOs',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsOs',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsOsHostTestCases', '--include-filter', 'CtsOsTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsOs',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-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_N/control.7.1_r27.arm.CtsPermission b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsPermission
similarity index 88%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsPermission
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsPermission
index c46c08a..4833d78 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsPermission
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsPermission
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsPermission'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsPermission'
 ATTRIBUTES = 'suite:arc-cts, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         iterations=1,
         max_retry=3,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsPermission',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsPermission',
+        tag='7.1_r28.arm.CtsPermission',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsPermission',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPermission2TestCases', '--include-filter', 'CtsPermissionTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsPermission',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=5400)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsPreference b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsPreference
similarity index 87%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsPreference
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsPreference
index 962101f..6e663ee 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsPreference
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsPreference
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsPreference'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsPreference'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsPreference',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsPreference',
+        tag='7.1_r28.arm.CtsPreference',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsPreference',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPreference2TestCases', '--include-filter', 'CtsPreferenceTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsPreference',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=5400)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsPrintTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsPrintTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsPrintTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsPrintTestCases
index 9b5e82b..9e0439e 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsPrintTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsPrintTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsPrintTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsPrintTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsPrintTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsPrintTestCases',
+        tag='7.1_r28.arm.CtsPrintTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsPrintTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPrintTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsPrintTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=10800)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsProviderTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsProviderTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsProviderTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsProviderTestCases
index 7cf8a6f..201cc06 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsProviderTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsProviderTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsProviderTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsProviderTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsProviderTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsProviderTestCases',
+        tag='7.1_r28.arm.CtsProviderTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsProviderTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsProviderTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsProviderTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-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_N/control.7.1_r27.arm.CtsRenderscript b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsRenderscript
similarity index 87%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsRenderscript
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsRenderscript
index 4566ba8..69478e2 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsRenderscript
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsRenderscript
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsRenderscript'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsRenderscript'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsRenderscript',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsRenderscript',
+        tag='7.1_r28.arm.CtsRenderscript',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsRenderscript',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsRenderscriptLegacyTestCases', '--include-filter', 'CtsRenderscriptTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsRenderscript',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=5400)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsRetailDemoHostTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsRetailDemoHostTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsRetailDemoHostTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsRetailDemoHostTestCases
index 80556d4..be530ce 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsRetailDemoHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsRetailDemoHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsRetailDemoHostTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsRetailDemoHostTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsRetailDemoHostTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsRetailDemoHostTestCases',
+        tag='7.1_r28.arm.CtsRetailDemoHostTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsRetailDemoHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsRetailDemoHostTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsRetailDemoHostTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsRs b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsRs
similarity index 88%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsRs
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsRs
index c5bd89e..b553da8 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsRs
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsRs
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsRs'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsRs'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsRs',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsRs',
+        tag='7.1_r28.arm.CtsRs',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsRs',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsRsBlasTestCases', '--include-filter', 'CtsRsCppTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsRs',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=5400)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsSample b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsSample
similarity index 88%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsSample
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsSample
index 9a67e8a..1cb1cb1 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsSample
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsSample
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsSample'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsSample'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsSample',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsSample',
+        tag='7.1_r28.arm.CtsSample',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsSample',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSampleDeviceTestCases', '--include-filter', 'CtsSampleHostTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsSample',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=5400)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsSaxTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsSaxTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsSaxTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsSaxTestCases
index 7525bb0..c8cae4d 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsSaxTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsSaxTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsSaxTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsSaxTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsSaxTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsSaxTestCases',
+        tag='7.1_r28.arm.CtsSaxTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsSaxTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSaxTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsSaxTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsSecurity b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsSecurity
similarity index 88%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsSecurity
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsSecurity
index 1ed41ce..b1d10cd 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsSecurity
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsSecurity
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsSecurity'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsSecurity'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsSecurity',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsSecurity',
+        tag='7.1_r28.arm.CtsSecurity',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsSecurity',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecurityHostTestCases', '--include-filter', 'CtsSecurityTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsSecurity',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         precondition_commands=['echo 3 > /proc/sys/kernel/perf_event_paranoid'],
         timeout=10800)
 
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsServicesHostTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsServicesHostTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsServicesHostTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsServicesHostTestCases
index d3e9759..e5b3612 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsServicesHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsServicesHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsServicesHostTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsServicesHostTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsServicesHostTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsServicesHostTestCases',
+        tag='7.1_r28.arm.CtsServicesHostTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsServicesHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsServicesHostTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsServicesHostTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsShortcut b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsShortcut
similarity index 88%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsShortcut
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsShortcut
index e2c1ed7..a4c070f 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsShortcut
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsShortcut
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsShortcut'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsShortcut'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsShortcut',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsShortcut',
+        tag='7.1_r28.arm.CtsShortcut',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsShortcut',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsShortcutHostTestCases', '--include-filter', 'CtsShortcutManagerTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsShortcut',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=9000)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsSignatureTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsSignatureTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsSignatureTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsSignatureTestCases
index c9a3cc6..41f556a 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsSignatureTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsSignatureTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsSignatureTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsSignatureTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         iterations=1,
         max_retry=3,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsSignatureTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsSignatureTestCases',
+        tag='7.1_r28.arm.CtsSignatureTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsSignatureTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSignatureTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsSignatureTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsSimpleCpuTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsSimpleCpuTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsSimpleCpuTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsSimpleCpuTestCases
index 6251267..1d0b76f 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsSimpleCpuTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsSimpleCpuTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsSimpleCpuTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsSimpleCpuTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsSimpleCpuTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsSimpleCpuTestCases',
+        tag='7.1_r28.arm.CtsSimpleCpuTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsSimpleCpuTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSimpleCpuTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsSimpleCpuTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsSimpleperfTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsSimpleperfTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsSimpleperfTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsSimpleperfTestCases
index 3c73afa..f32bd3e 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsSimpleperfTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsSimpleperfTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsSimpleperfTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsSimpleperfTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         iterations=1,
         max_retry=3,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsSimpleperfTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsSimpleperfTestCases',
+        tag='7.1_r28.arm.CtsSimpleperfTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsSimpleperfTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSimpleperfTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsSimpleperfTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsSpeechTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsSpeechTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsSpeechTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsSpeechTestCases
index 5070bb8..dd264a9 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsSpeechTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsSpeechTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsSpeechTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsSpeechTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         iterations=1,
         max_retry=3,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsSpeechTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsSpeechTestCases',
+        tag='7.1_r28.arm.CtsSpeechTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsSpeechTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSpeechTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsSpeechTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsSustainedPerformanceHostTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsSustainedPerformanceHostTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsSustainedPerformanceHostTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsSustainedPerformanceHostTestCases
index ec4d14b..736ddf3 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsSustainedPerformanceHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsSustainedPerformanceHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsSustainedPerformanceHostTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsSustainedPerformanceHostTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsSustainedPerformanceHostTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsSustainedPerformanceHostTestCases',
+        tag='7.1_r28.arm.CtsSustainedPerformanceHostTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsSustainedPerformanceHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSustainedPerformanceHostTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsSustainedPerformanceHostTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsSystem b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsSystem
similarity index 88%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsSystem
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsSystem
index 42f488f..0afc5f5 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsSystem
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsSystem
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsSystem'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsSystem'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsSystem',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsSystem',
+        tag='7.1_r28.arm.CtsSystem',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsSystem',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSystemIntentTestCases', '--include-filter', 'CtsSystemUiHostTestCases', '--include-filter', 'CtsSystemUiTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsSystem',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=7200)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsTelecom b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsTelecom
similarity index 88%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsTelecom
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsTelecom
index c9d122c..d861433 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsTelecom
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsTelecom
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsTelecom'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsTelecom'
 ATTRIBUTES = 'suite:arc-cts, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         iterations=1,
         max_retry=3,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsTelecom',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsTelecom',
+        tag='7.1_r28.arm.CtsTelecom',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsTelecom',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTelecomTestCases', '--include-filter', 'CtsTelecomTestCases2', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsTelecom',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=5400)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsTelephony b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsTelephony
similarity index 88%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsTelephony
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsTelephony
index 24d60c4..87d08d9 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsTelephony
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsTelephony
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsTelephony'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsTelephony'
 ATTRIBUTES = 'suite:arc-cts, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         iterations=1,
         max_retry=3,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsTelephony',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsTelephony',
+        tag='7.1_r28.arm.CtsTelephony',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsTelephony',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTelephony2TestCases', '--include-filter', 'CtsTelephonyTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsTelephony',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=5400)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsTextTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsTextTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsTextTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsTextTestCases
index 8bcd5fa..e72dc70 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsTextTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsTextTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsTextTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsTextTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsTextTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsTextTestCases',
+        tag='7.1_r28.arm.CtsTextTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsTextTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTextTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsTextTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsTextureViewTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsTextureViewTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsTextureViewTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsTextureViewTestCases
index 2c56536..6745092 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsTextureViewTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsTextureViewTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsTextureViewTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsTextureViewTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsTextureViewTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsTextureViewTestCases',
+        tag='7.1_r28.arm.CtsTextureViewTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsTextureViewTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTextureViewTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsTextureViewTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsTheme b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsTheme
similarity index 88%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsTheme
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsTheme
index bf3dd2b..7340258 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsTheme
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsTheme
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsTheme'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsTheme'
 ATTRIBUTES = 'suite:arc-cts, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         iterations=1,
         max_retry=3,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsTheme',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsTheme',
+        tag='7.1_r28.arm.CtsTheme',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsTheme',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsThemeDeviceTestCases', '--include-filter', 'CtsThemeHostTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsTheme',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=25200)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsToast b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsToast
similarity index 88%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsToast
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsToast
index d98288f..b9aa46e 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsToast
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsToast
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsToast'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsToast'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsToast',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsToast',
+        tag='7.1_r28.arm.CtsToast',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsToast',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsToastLegacyTestCases', '--include-filter', 'CtsToastTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsToast',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=5400)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsTransitionTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsTransitionTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsTransitionTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsTransitionTestCases
index 900144a..8dda2fd 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsTransitionTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsTransitionTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsTransitionTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsTransitionTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         iterations=1,
         max_retry=3,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsTransitionTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsTransitionTestCases',
+        tag='7.1_r28.arm.CtsTransitionTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsTransitionTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTransitionTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsTransitionTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsTrustedVoiceHostTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsTrustedVoiceHostTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsTrustedVoiceHostTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsTrustedVoiceHostTestCases
index 598ca73..3e0cce2 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsTrustedVoiceHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsTrustedVoiceHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsTrustedVoiceHostTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsTrustedVoiceHostTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsTrustedVoiceHostTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsTrustedVoiceHostTestCases',
+        tag='7.1_r28.arm.CtsTrustedVoiceHostTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsTrustedVoiceHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTrustedVoiceHostTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsTrustedVoiceHostTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsTv b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsTv
similarity index 89%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsTv
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsTv
index 463b28b..ef8ecdc 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsTv
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsTv
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsTv'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsTv'
 ATTRIBUTES = 'suite:arc-cts, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         iterations=1,
         max_retry=3,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsTv',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsTv',
+        tag='7.1_r28.arm.CtsTv',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsTv',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTvProviderTestCases', '--include-filter', 'CtsTvTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsTv',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=5400)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsUi b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsUi
similarity index 90%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsUi
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsUi
index 48a0269..fe3ebb7 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsUi
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsUi
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsUi'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsUi'
 ATTRIBUTES = 'suite:arc-cts, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         iterations=1,
         max_retry=3,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsUi',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsUi',
+        tag='7.1_r28.arm.CtsUi',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsUi',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUiAutomationTestCases', '--include-filter', 'CtsUiDeviceTestCases', '--include-filter', 'CtsUiHostTestCases', '--include-filter', 'CtsUiRenderingTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsUi',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=9000)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsUidIsolationTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsUidIsolationTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsUidIsolationTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsUidIsolationTestCases
index b2adf1a..bb1654a 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsUidIsolationTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsUidIsolationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsUidIsolationTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsUidIsolationTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsUidIsolationTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsUidIsolationTestCases',
+        tag='7.1_r28.arm.CtsUidIsolationTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsUidIsolationTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUidIsolationTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsUidIsolationTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsUsageStatsTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsUsageStatsTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsUsageStatsTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsUsageStatsTestCases
index 565d3c9..325708b 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsUsageStatsTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsUsageStatsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsUsageStatsTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsUsageStatsTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsUsageStatsTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsUsageStatsTestCases',
+        tag='7.1_r28.arm.CtsUsageStatsTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsUsageStatsTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUsageStatsTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsUsageStatsTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsUsbTests b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsUsbTests
similarity index 87%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsUsbTests
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsUsbTests
index b983e9c..fe53551 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsUsbTests
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsUsbTests
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsUsbTests'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsUsbTests'
 ATTRIBUTES = 'suite:arc-cts, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         iterations=1,
         max_retry=3,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsUsbTests',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsUsbTests',
+        tag='7.1_r28.arm.CtsUsbTests',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsUsbTests',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUsbTests', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsUsbTests',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsUtilTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsUtilTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsUtilTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsUtilTestCases
index 85857c0..e4caca2 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsUtilTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsUtilTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsUtilTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsUtilTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsUtilTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsUtilTestCases',
+        tag='7.1_r28.arm.CtsUtilTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsUtilTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUtilTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsUtilTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsVideoTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsVideoTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsVideoTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsVideoTestCases
index 890d02e..3422cd7 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsVideoTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsVideoTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsVideoTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsVideoTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsVideoTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsVideoTestCases',
+        tag='7.1_r28.arm.CtsVideoTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsVideoTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsVideoTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsVideoTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsViewTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsViewTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsViewTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsViewTestCases
index 8e45b90..397e1b2 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsViewTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsViewTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsViewTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsViewTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsViewTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsViewTestCases',
+        tag='7.1_r28.arm.CtsViewTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsViewTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsViewTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsViewTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsVmTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsVmTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsVmTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsVmTestCases
index 7fb0a3d..3bdac74 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsVmTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsVmTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsVmTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsVmTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsVmTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsVmTestCases',
+        tag='7.1_r28.arm.CtsVmTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsVmTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsVmTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsVmTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=5400)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsVoice b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsVoice
similarity index 88%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsVoice
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsVoice
index 47ec926..30cbb60 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsVoice
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsVoice
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsVoice'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsVoice'
 ATTRIBUTES = 'suite:arc-cts, suite:bvt-perbuild'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         iterations=1,
         max_retry=3,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsVoice',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsVoice',
+        tag='7.1_r28.arm.CtsVoice',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsVoice',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsVoiceInteractionTestCases', '--include-filter', 'CtsVoiceSettingsTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsVoice',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=5400)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsVrTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsVrTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsVrTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsVrTestCases
index 9801994..18d0b37 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsVrTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsVrTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsVrTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsVrTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsVrTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsVrTestCases',
+        tag='7.1_r28.arm.CtsVrTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsVrTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsVrTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsVrTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsWebkitTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsWebkitTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsWebkitTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsWebkitTestCases
index b3b2b59..ee100f1 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsWebkitTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsWebkitTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsWebkitTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsWebkitTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsWebkitTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsWebkitTestCases',
+        tag='7.1_r28.arm.CtsWebkitTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsWebkitTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsWebkitTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsWebkitTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsWidgetTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsWidgetTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsWidgetTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsWidgetTestCases
index ca13e95..347647c 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.CtsWidgetTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.CtsWidgetTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.CtsWidgetTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.CtsWidgetTestCases'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.CtsWidgetTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.CtsWidgetTestCases',
+        tag='7.1_r28.arm.CtsWidgetTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.CtsWidgetTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsWidgetTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsWidgetTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.all.CtsAadbHostTestCases_-_CtsAccountManagerTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.all.CtsAadbHostTestCases_-_CtsAccountManagerTestCases
similarity index 88%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.all.CtsAadbHostTestCases_-_CtsAccountManagerTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.all.CtsAadbHostTestCases_-_CtsAccountManagerTestCases
index 0b356b4..e819494 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.all.CtsAadbHostTestCases_-_CtsAccountManagerTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.all.CtsAadbHostTestCases_-_CtsAccountManagerTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.all.CtsAadbHostTestCases_-_CtsAccountManagerTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.all.CtsAadbHostTestCases_-_CtsAccountManagerTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         iterations=1,
         max_retry=9,
         needs_push_media=False,
-        tag='7.1_r27.arm.all.CtsAadbHostTestCases_-_CtsAccountManagerTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.all.CtsAadbHostTestCases_-_CtsAccountManagerTestCases',
+        tag='7.1_r28.arm.all.CtsAadbHostTestCases_-_CtsAccountManagerTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.all.CtsAadbHostTestCases_-_CtsAccountManagerTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAadbHostTestCases', '--include-filter', 'CtsAbiOverrideHostTestCases', '--include-filter', 'CtsAccelerationTestCases', '--include-filter', 'CtsAccessibilityServiceTestCases', '--include-filter', 'CtsAccessibilityTestCases', '--include-filter', 'CtsAccountManagerTestCases', '--disable-reboot', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--retry', '{session_id}'],
         target_module='all.CtsAadbHostTestCases_-_CtsAccountManagerTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=172800)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.all.CtsAdminTestCases_-_CtsDatabaseTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.all.CtsAdminTestCases_-_CtsDatabaseTestCases
similarity index 92%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.all.CtsAdminTestCases_-_CtsDatabaseTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.all.CtsAdminTestCases_-_CtsDatabaseTestCases
index a667a4f..6f59499 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.all.CtsAdminTestCases_-_CtsDatabaseTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.all.CtsAdminTestCases_-_CtsDatabaseTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.all.CtsAdminTestCases_-_CtsDatabaseTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.all.CtsAdminTestCases_-_CtsDatabaseTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -23,14 +23,14 @@
         max_retry=9,
         enable_default_apps=True,
         needs_push_media=False,
-        tag='7.1_r27.arm.all.CtsAdminTestCases_-_CtsDatabaseTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.all.CtsAdminTestCases_-_CtsDatabaseTestCases',
+        tag='7.1_r28.arm.all.CtsAdminTestCases_-_CtsDatabaseTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.all.CtsAdminTestCases_-_CtsDatabaseTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAdminTestCases', '--include-filter', 'CtsAlarmClockTestCases', '--include-filter', 'CtsAndroidAppTestCases', '--include-filter', 'CtsAnimationTestCases', '--include-filter', 'CtsAppSecurityHostTestCases', '--include-filter', 'CtsAppTestCases', '--include-filter', 'CtsAppUsageHostTestCases', '--include-filter', 'CtsAppWidgetTestCases', '--include-filter', 'CtsAslrMallocTestCases', '--include-filter', 'CtsAssistTestCases', '--include-filter', 'CtsAtraceHostTestCases', '--include-filter', 'CtsBackupHostTestCases', '--include-filter', 'CtsBackupTestCases', '--include-filter', 'CtsBionicTestCases', '--include-filter', 'CtsBluetoothTestCases', '--include-filter', 'CtsCalendarcommon2TestCases', '--include-filter', 'CtsCameraTestCases', '--include-filter', 'CtsCarTestCases', '--include-filter', 'CtsCarrierApiTestCases', '--include-filter', 'CtsCompilationTestCases', '--include-filter', 'CtsContentTestCases', '--include-filter', 'CtsCppToolsTestCases', '--include-filter', 'CtsDatabaseTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='all.CtsAdminTestCases_-_CtsDatabaseTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         login_precondition_commands=['lsblk -do NAME,RM | sed -n s/1$//p | xargs -n1 eject'],
         timeout=172800)
 
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases
index f38d3e4..11892c6 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         iterations=1,
         max_retry=9,
         needs_push_media=False,
-        tag='7.1_r27.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases',
+        tag='7.1_r28.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--disable-reboot', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='all.CtsDeqpTestCases_-_CtsDeqpTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=172800)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.all.CtsDeviceAdminUninstallerTestCases_-_CtsExternalServiceTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.all.CtsDeviceAdminUninstallerTestCases_-_CtsExternalServiceTestCases
similarity index 90%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.all.CtsDeviceAdminUninstallerTestCases_-_CtsExternalServiceTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.all.CtsDeviceAdminUninstallerTestCases_-_CtsExternalServiceTestCases
index aebdbac..aaf1e9f 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.all.CtsDeviceAdminUninstallerTestCases_-_CtsExternalServiceTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.all.CtsDeviceAdminUninstallerTestCases_-_CtsExternalServiceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.all.CtsDeviceAdminUninstallerTestCases_-_CtsExternalServiceTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.all.CtsDeviceAdminUninstallerTestCases_-_CtsExternalServiceTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         iterations=1,
         max_retry=9,
         needs_push_media=False,
-        tag='7.1_r27.arm.all.CtsDeviceAdminUninstallerTestCases_-_CtsExternalServiceTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.all.CtsDeviceAdminUninstallerTestCases_-_CtsExternalServiceTestCases',
+        tag='7.1_r28.arm.all.CtsDeviceAdminUninstallerTestCases_-_CtsExternalServiceTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.all.CtsDeviceAdminUninstallerTestCases_-_CtsExternalServiceTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeviceAdminUninstallerTestCases', '--include-filter', 'CtsDevicePolicyManagerTestCases', '--include-filter', 'CtsDisplayTestCases', '--include-filter', 'CtsDpiTestCases', '--include-filter', 'CtsDpiTestCases2', '--include-filter', 'CtsDragAndDropHostTestCases', '--include-filter', 'CtsDramTestCases', '--include-filter', 'CtsDreamsTestCases', '--include-filter', 'CtsDrmTestCases', '--include-filter', 'CtsDumpsysHostTestCases', '--include-filter', 'CtsEffectTestCases', '--include-filter', 'CtsExternalServiceTestCases', '--disable-reboot', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--retry', '{session_id}'],
         target_module='all.CtsDeviceAdminUninstallerTestCases_-_CtsExternalServiceTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=172800)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
index cc78aba..dccd454 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         iterations=1,
         max_retry=9,
         needs_push_media=False,
-        tag='7.1_r27.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases',
+        tag='7.1_r28.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsFileSystemTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='all.CtsFileSystemTestCases_-_CtsFileSystemTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=172800)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.all.CtsFragmentTestCases_-_CtsLocationTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.all.CtsFragmentTestCases_-_CtsLocationTestCases
similarity index 92%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.all.CtsFragmentTestCases_-_CtsLocationTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.all.CtsFragmentTestCases_-_CtsLocationTestCases
index a15c84e..e791827 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.all.CtsFragmentTestCases_-_CtsLocationTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.all.CtsFragmentTestCases_-_CtsLocationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.all.CtsFragmentTestCases_-_CtsLocationTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.all.CtsFragmentTestCases_-_CtsLocationTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         iterations=1,
         max_retry=9,
         needs_push_media=False,
-        tag='7.1_r27.arm.all.CtsFragmentTestCases_-_CtsLocationTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.all.CtsFragmentTestCases_-_CtsLocationTestCases',
+        tag='7.1_r28.arm.all.CtsFragmentTestCases_-_CtsLocationTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.all.CtsFragmentTestCases_-_CtsLocationTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsFragmentTestCases', '--include-filter', 'CtsGestureTestCases', '--include-filter', 'CtsGraphics2TestCases', '--include-filter', 'CtsGraphicsTestCases', '--include-filter', 'CtsHardwareTestCases', '--include-filter', 'CtsHostsideNetworkTests', '--include-filter', 'CtsHostsideNumberBlockingTestCases', '--include-filter', 'CtsHostsideTvTests', '--include-filter', 'CtsIcuTestCases', '--include-filter', 'CtsJankDeviceTestCases', '--include-filter', 'CtsJdwpSecurityHostTestCases', '--include-filter', 'CtsJdwpTestCases', '--include-filter', 'CtsJniTestCases', '--include-filter', 'CtsJobSchedulerTestCases', '--include-filter', 'CtsKeystoreTestCases', '--include-filter', 'CtsLeanbackJankTestCases', '--include-filter', 'CtsLibcoreLegacy22TestCases', '--include-filter', 'CtsLibcoreOjTestCases', '--include-filter', 'CtsLibcoreOkHttpTestCases', '--include-filter', 'CtsLibcoreTestCases', '--include-filter', 'CtsLocation2TestCases', '--include-filter', 'CtsLocationTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='all.CtsFragmentTestCases_-_CtsLocationTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         login_precondition_commands=['lsblk -do NAME,RM | sed -n s/1$//p | xargs -n1 eject'],
         timeout=172800)
 
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.all.CtsMediaStressTestCases_-_CtsMediaTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.all.CtsMediaStressTestCases_-_CtsMediaTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.all.CtsMediaStressTestCases_-_CtsMediaTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.all.CtsMediaStressTestCases_-_CtsMediaTestCases
index f225ca7..2d4fc75 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.all.CtsMediaStressTestCases_-_CtsMediaTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.all.CtsMediaStressTestCases_-_CtsMediaTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.all.CtsMediaStressTestCases_-_CtsMediaTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.all.CtsMediaStressTestCases_-_CtsMediaTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         iterations=1,
         max_retry=9,
         needs_push_media=True,
-        tag='7.1_r27.arm.all.CtsMediaStressTestCases_-_CtsMediaTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.all.CtsMediaStressTestCases_-_CtsMediaTestCases',
+        tag='7.1_r28.arm.all.CtsMediaStressTestCases_-_CtsMediaTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.all.CtsMediaStressTestCases_-_CtsMediaTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaStressTestCases', '--include-filter', 'CtsMediaTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='all.CtsMediaStressTestCases_-_CtsMediaTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         login_precondition_commands=['lsblk -do NAME,RM | sed -n s/1$//p | xargs -n1 eject'],
         timeout=172800)
 
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.all.CtsMidiTestCases_-_CtsSecurityHostTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.all.CtsMidiTestCases_-_CtsSecurityHostTestCases
similarity index 95%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.all.CtsMidiTestCases_-_CtsSecurityHostTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.all.CtsMidiTestCases_-_CtsSecurityHostTestCases
index e4c110c..cc1738b 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.all.CtsMidiTestCases_-_CtsSecurityHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.all.CtsMidiTestCases_-_CtsSecurityHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.all.CtsMidiTestCases_-_CtsSecurityHostTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.arm.all.CtsMidiTestCases_-_CtsSecurityHostTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         iterations=1,
         max_retry=9,
         needs_push_media=False,
-        tag='7.1_r27.arm.all.CtsMidiTestCases_-_CtsSecurityHostTestCases',
-        test_name='cheets_CTS_N.7.1_r27.arm.all.CtsMidiTestCases_-_CtsSecurityHostTestCases',
+        tag='7.1_r28.arm.all.CtsMidiTestCases_-_CtsSecurityHostTestCases',
+        test_name='cheets_CTS_N.7.1_r28.arm.all.CtsMidiTestCases_-_CtsSecurityHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMidiTestCases', '--include-filter', 'CtsMonkeyTestCases', '--include-filter', 'CtsMultiUserHostTestCases', '--include-filter', 'CtsMultiUserTestCases', '--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', 'CtsNetSecConfigResourcesSrcTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficFalseTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficTrueTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases', '--include-filter', 'CtsNetTestCases', '--include-filter', 'CtsNetTestCasesLegacyApi22', '--include-filter', 'CtsNetTestCasesLegacyPermission22', '--include-filter', 'CtsOpenGLTestCases', '--include-filter', 'CtsOpenGlPerf2TestCases', '--include-filter', 'CtsOpenGlPerfTestCases', '--include-filter', 'CtsOsHostTestCases', '--include-filter', 'CtsOsTestCases', '--include-filter', 'CtsPermission2TestCases', '--include-filter', 'CtsPermissionTestCases', '--include-filter', 'CtsPreference2TestCases', '--include-filter', 'CtsPreferenceTestCases', '--include-filter', 'CtsPrintTestCases', '--include-filter', 'CtsProviderTestCases', '--include-filter', 'CtsRenderscriptLegacyTestCases', '--include-filter', 'CtsRenderscriptTestCases', '--include-filter', 'CtsRetailDemoHostTestCases', '--include-filter', 'CtsRsBlasTestCases', '--include-filter', 'CtsRsCppTestCases', '--include-filter', 'CtsSampleDeviceTestCases', '--include-filter', 'CtsSampleHostTestCases', '--include-filter', 'CtsSaxTestCases', '--include-filter', 'CtsSecurityHostTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='all.CtsMidiTestCases_-_CtsSecurityHostTestCases',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         login_precondition_commands=['lsblk -do NAME,RM | sed -n s/1$//p | xargs -n1 eject'],
         precondition_commands=['echo 3 > /proc/sys/kernel/perf_event_paranoid'],
         timeout=172800)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.all.CtsSecurityTestCases_-_vm-tests-tf b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.all.CtsSecurityTestCases_-_vm-tests-tf
similarity index 94%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.all.CtsSecurityTestCases_-_vm-tests-tf
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.all.CtsSecurityTestCases_-_vm-tests-tf
index 93ba627..795b162 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.all.CtsSecurityTestCases_-_vm-tests-tf
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.all.CtsSecurityTestCases_-_vm-tests-tf
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.all.CtsSecurityTestCases_-_vm-tests-tf'
+NAME = 'cheets_CTS_N.7.1_r28.arm.all.CtsSecurityTestCases_-_vm-tests-tf'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         iterations=1,
         max_retry=9,
         needs_push_media=False,
-        tag='7.1_r27.arm.all.CtsSecurityTestCases_-_vm-tests-tf',
-        test_name='cheets_CTS_N.7.1_r27.arm.all.CtsSecurityTestCases_-_vm-tests-tf',
+        tag='7.1_r28.arm.all.CtsSecurityTestCases_-_vm-tests-tf',
+        test_name='cheets_CTS_N.7.1_r28.arm.all.CtsSecurityTestCases_-_vm-tests-tf',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecurityTestCases', '--include-filter', 'CtsServicesHostTestCases', '--include-filter', 'CtsShortcutHostTestCases', '--include-filter', 'CtsShortcutManagerTestCases', '--include-filter', 'CtsSignatureTestCases', '--include-filter', 'CtsSimpleCpuTestCases', '--include-filter', 'CtsSimpleperfTestCases', '--include-filter', 'CtsSpeechTestCases', '--include-filter', 'CtsSustainedPerformanceHostTestCases', '--include-filter', 'CtsSystemIntentTestCases', '--include-filter', 'CtsSystemUiHostTestCases', '--include-filter', 'CtsSystemUiTestCases', '--include-filter', 'CtsTelecomTestCases', '--include-filter', 'CtsTelecomTestCases2', '--include-filter', 'CtsTelephony2TestCases', '--include-filter', 'CtsTelephonyTestCases', '--include-filter', 'CtsTextTestCases', '--include-filter', 'CtsTextureViewTestCases', '--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', 'CtsUiHostTestCases', '--include-filter', 'CtsUiRenderingTestCases', '--include-filter', 'CtsUidIsolationTestCases', '--include-filter', 'CtsUsageStatsTestCases', '--include-filter', 'CtsUsbTests', '--include-filter', 'CtsUtilTestCases', '--include-filter', 'CtsVideoTestCases', '--include-filter', 'CtsViewTestCases', '--include-filter', 'CtsVmTestCases', '--include-filter', 'CtsVoiceInteractionTestCases', '--include-filter', 'CtsVoiceSettingsTestCases', '--include-filter', 'CtsVrTestCases', '--include-filter', 'CtsWebkitTestCases', '--include-filter', 'CtsWidgetTestCases', '--include-filter', 'vm-tests-tf', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='all.CtsSecurityTestCases_-_vm-tests-tf',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=172800)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.tradefed-run-collect-tests-only-internal b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.tradefed-run-collect-tests-only-internal
similarity index 82%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.tradefed-run-collect-tests-only-internal
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.tradefed-run-collect-tests-only-internal
index ab89448..b655eb2 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.tradefed-run-collect-tests-only-internal
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.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_N.7.1_r27.arm.tradefed-run-collect-tests-only-internal'
+NAME = 'cheets_CTS_N.7.1_r28.arm.tradefed-run-collect-tests-only-internal'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-qual'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 0
@@ -22,14 +22,14 @@
         iterations=1,
         max_retry=0,
         needs_push_media=False,
-        tag='7.1_r27.arm.tradefed-run-collect-tests-only-internal',
-        test_name='cheets_CTS_N.7.1_r27.arm.tradefed-run-collect-tests-only-internal',
+        tag='7.1_r28.arm.tradefed-run-collect-tests-only-internal',
+        test_name='cheets_CTS_N.7.1_r28.arm.tradefed-run-collect-tests-only-internal',
         run_template=['run', 'commandAndExit', 'collect-tests-only'],
         retry_template=None,
         target_module=None,
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=2400)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.vm-tests-tf b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.vm-tests-tf
similarity index 87%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.arm.vm-tests-tf
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.arm.vm-tests-tf
index 1d95d0d..751aee3 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.arm.vm-tests-tf
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.arm.vm-tests-tf
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.arm.vm-tests-tf'
+NAME = 'cheets_CTS_N.7.1_r28.arm.vm-tests-tf'
 ATTRIBUTES = 'suite:arc-cts'
 DEPENDENCIES = 'arc'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.arm.vm-tests-tf',
-        test_name='cheets_CTS_N.7.1_r27.arm.vm-tests-tf',
+        tag='7.1_r28.arm.vm-tests-tf',
+        test_name='cheets_CTS_N.7.1_r28.arm.vm-tests-tf',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'vm-tests-tf', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='vm-tests-tf',
         target_plan=None,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-arm.zip',
         timeout=7200)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsAadbHostTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsAadbHostTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsAadbHostTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsAadbHostTestCases
index 129228b..69bfa89 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsAadbHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsAadbHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsAadbHostTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsAadbHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsAadbHostTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsAadbHostTestCases',
+        tag='7.1_r28.x86.CtsAadbHostTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsAadbHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAadbHostTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsAadbHostTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsAbiOverrideHostTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsAbiOverrideHostTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsAbiOverrideHostTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsAbiOverrideHostTestCases
index 5aaec47..8dafbd1 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsAbiOverrideHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsAbiOverrideHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsAbiOverrideHostTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsAbiOverrideHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsAbiOverrideHostTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsAbiOverrideHostTestCases',
+        tag='7.1_r28.x86.CtsAbiOverrideHostTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsAbiOverrideHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAbiOverrideHostTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsAbiOverrideHostTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsAccelerationTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsAccelerationTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsAccelerationTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsAccelerationTestCases
index 252bf30..eff347a 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsAccelerationTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsAccelerationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsAccelerationTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsAccelerationTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsAccelerationTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsAccelerationTestCases',
+        tag='7.1_r28.x86.CtsAccelerationTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsAccelerationTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAccelerationTestCases', '--disable-reboot', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--retry', '{session_id}'],
         target_module='CtsAccelerationTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsAccessibility b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsAccessibility
similarity index 87%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsAccessibility
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsAccessibility
index 4a86169..a27acbb 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsAccessibility
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsAccessibility
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsAccessibility'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsAccessibility'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsAccessibility',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsAccessibility',
+        tag='7.1_r28.x86.CtsAccessibility',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsAccessibility',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAccessibilityServiceTestCases', '--include-filter', 'CtsAccessibilityTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsAccessibility',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=5400)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsAccountManagerTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsAccountManagerTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsAccountManagerTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsAccountManagerTestCases
index 34da3b2..eaa1773 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsAccountManagerTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsAccountManagerTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsAccountManagerTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsAccountManagerTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsAccountManagerTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsAccountManagerTestCases',
+        tag='7.1_r28.x86.CtsAccountManagerTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsAccountManagerTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAccountManagerTestCases', '--disable-reboot', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--retry', '{session_id}'],
         target_module='CtsAccountManagerTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsAdminTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsAdminTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsAdminTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsAdminTestCases
index 927d647..f7658cc 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsAdminTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsAdminTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsAdminTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsAdminTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsAdminTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsAdminTestCases',
+        tag='7.1_r28.x86.CtsAdminTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsAdminTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAdminTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsAdminTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsAlarmClockTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsAlarmClockTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsAlarmClockTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsAlarmClockTestCases
index 06ac2bc..747b9c7 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsAlarmClockTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsAlarmClockTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsAlarmClockTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsAlarmClockTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsAlarmClockTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsAlarmClockTestCases',
+        tag='7.1_r28.x86.CtsAlarmClockTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsAlarmClockTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAlarmClockTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsAlarmClockTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsAndroidAppTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsAndroidAppTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsAndroidAppTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsAndroidAppTestCases
index ca47ea1..c853e5f 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsAndroidAppTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsAndroidAppTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsAndroidAppTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsAndroidAppTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsAndroidAppTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsAndroidAppTestCases',
+        tag='7.1_r28.x86.CtsAndroidAppTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsAndroidAppTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAndroidAppTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsAndroidAppTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsAnimationTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsAnimationTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsAnimationTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsAnimationTestCases
index 5df248f..e9b2386 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsAnimationTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsAnimationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsAnimationTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsAnimationTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsAnimationTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsAnimationTestCases',
+        tag='7.1_r28.x86.CtsAnimationTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsAnimationTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAnimationTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsAnimationTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsApp b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsApp
similarity index 90%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsApp
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsApp
index d95c1e0..9e73db0 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsApp
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsApp
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsApp'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsApp'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         iterations=1,
         enable_default_apps=True,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsApp',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsApp',
+        tag='7.1_r28.x86.CtsApp',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsApp',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAppSecurityHostTestCases', '--include-filter', 'CtsAppTestCases', '--include-filter', 'CtsAppUsageHostTestCases', '--include-filter', 'CtsAppWidgetTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsApp',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         login_precondition_commands=['lsblk -do NAME,RM | sed -n s/1$//p | xargs -n1 eject'],
         timeout=12600)
 
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsAslrMallocTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsAslrMallocTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsAslrMallocTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsAslrMallocTestCases
index 6790f5d..7c76f2f 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsAslrMallocTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsAslrMallocTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsAslrMallocTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsAslrMallocTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsAslrMallocTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsAslrMallocTestCases',
+        tag='7.1_r28.x86.CtsAslrMallocTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsAslrMallocTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAslrMallocTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsAslrMallocTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsAssistTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsAssistTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsAssistTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsAssistTestCases
index dd9fc10..c05ce9b 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsAssistTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsAssistTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsAssistTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsAssistTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsAssistTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsAssistTestCases',
+        tag='7.1_r28.x86.CtsAssistTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsAssistTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAssistTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsAssistTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsAtraceHostTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsAtraceHostTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsAtraceHostTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsAtraceHostTestCases
index 840102b..b9adf85 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsAtraceHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsAtraceHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsAtraceHostTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsAtraceHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsAtraceHostTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsAtraceHostTestCases',
+        tag='7.1_r28.x86.CtsAtraceHostTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsAtraceHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAtraceHostTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsAtraceHostTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsBackup b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsBackup
similarity index 88%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsBackup
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsBackup
index 784d56b..7ecc89c 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsBackup
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsBackup
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsBackup'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsBackup'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsBackup',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsBackup',
+        tag='7.1_r28.x86.CtsBackup',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsBackup',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsBackupHostTestCases', '--include-filter', 'CtsBackupTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsBackup',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=5400)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsBionicTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsBionicTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsBionicTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsBionicTestCases
index 49f5592..157a68b 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsBionicTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsBionicTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsBionicTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsBionicTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsBionicTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsBionicTestCases',
+        tag='7.1_r28.x86.CtsBionicTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsBionicTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsBionicTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsBionicTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsBluetoothTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsBluetoothTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsBluetoothTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsBluetoothTestCases
index d6a3c78..53c66bf 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsBluetoothTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsBluetoothTestCases
@@ -7,7 +7,7 @@
 from autotest_lib.server import utils
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsBluetoothTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsBluetoothTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -25,14 +25,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsBluetoothTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsBluetoothTestCases',
+        tag='7.1_r28.x86.CtsBluetoothTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsBluetoothTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsBluetoothTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsBluetoothTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         hard_reboot_on_failure=True,
         timeout=3600)
 
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsCalendarcommon2TestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsCalendarcommon2TestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsCalendarcommon2TestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsCalendarcommon2TestCases
index 6497542..c0698e3 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsCalendarcommon2TestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsCalendarcommon2TestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsCalendarcommon2TestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsCalendarcommon2TestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsCalendarcommon2TestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsCalendarcommon2TestCases',
+        tag='7.1_r28.x86.CtsCalendarcommon2TestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsCalendarcommon2TestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCalendarcommon2TestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsCalendarcommon2TestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsCameraTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsCameraTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsCameraTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsCameraTestCases
index 760c18d..f32c374 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsCameraTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsCameraTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsCameraTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsCameraTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsCameraTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsCameraTestCases',
+        tag='7.1_r28.x86.CtsCameraTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsCameraTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsCameraTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsCameraTestCases.camerabox.back b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsCameraTestCases.camerabox.back
similarity index 85%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsCameraTestCases.camerabox.back
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsCameraTestCases.camerabox.back
index 07e672f..98de6a2 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsCameraTestCases.camerabox.back
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsCameraTestCases.camerabox.back
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsCameraTestCases.camerabox.back'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsCameraTestCases.camerabox.back'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86, camerabox'
 JOB_RETRIES = 1
@@ -23,14 +23,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsCameraTestCases.camerabox.back',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsCameraTestCases.camerabox.back',
+        tag='7.1_r28.x86.CtsCameraTestCases.camerabox.back',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsCameraTestCases.camerabox.back',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsCameraTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsCameraTestCases.camerabox.front b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsCameraTestCases.camerabox.front
similarity index 85%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsCameraTestCases.camerabox.front
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsCameraTestCases.camerabox.front
index c3ba39d..888694a 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsCameraTestCases.camerabox.front
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsCameraTestCases.camerabox.front
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsCameraTestCases.camerabox.front'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsCameraTestCases.camerabox.front'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86, camerabox'
 JOB_RETRIES = 1
@@ -23,14 +23,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsCameraTestCases.camerabox.front',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsCameraTestCases.camerabox.front',
+        tag='7.1_r28.x86.CtsCameraTestCases.camerabox.front',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsCameraTestCases.camerabox.front',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsCameraTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsCarTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsCarTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsCarTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsCarTestCases
index c353a10..68ceb74 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsCarTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsCarTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsCarTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsCarTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsCarTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsCarTestCases',
+        tag='7.1_r28.x86.CtsCarTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsCarTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCarTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsCarTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsCarrierApiTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsCarrierApiTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsCarrierApiTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsCarrierApiTestCases
index f51ac75..4c84253 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsCarrierApiTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsCarrierApiTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsCarrierApiTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsCarrierApiTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsCarrierApiTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsCarrierApiTestCases',
+        tag='7.1_r28.x86.CtsCarrierApiTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsCarrierApiTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCarrierApiTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsCarrierApiTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsCompilationTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsCompilationTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsCompilationTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsCompilationTestCases
index 3051425..47de7a4 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsCompilationTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsCompilationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsCompilationTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsCompilationTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsCompilationTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsCompilationTestCases',
+        tag='7.1_r28.x86.CtsCompilationTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsCompilationTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCompilationTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsCompilationTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsContentTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsContentTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsContentTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsContentTestCases
index 93bcd4f..6d94866 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsContentTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsContentTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsContentTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsContentTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsContentTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsContentTestCases',
+        tag='7.1_r28.x86.CtsContentTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsContentTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsContentTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsContentTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsCppToolsTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsCppToolsTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsCppToolsTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsCppToolsTestCases
index ce5244b..125e0e1 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsCppToolsTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsCppToolsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsCppToolsTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsCppToolsTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsCppToolsTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsCppToolsTestCases',
+        tag='7.1_r28.x86.CtsCppToolsTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsCppToolsTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCppToolsTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsCppToolsTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsDatabaseTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsDatabaseTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsDatabaseTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsDatabaseTestCases
index abaf416..65a6c68 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsDatabaseTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsDatabaseTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsDatabaseTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsDatabaseTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsDatabaseTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsDatabaseTestCases',
+        tag='7.1_r28.x86.CtsDatabaseTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsDatabaseTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDatabaseTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsDatabaseTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsDeqpTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsDeqpTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsDeqpTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsDeqpTestCases
index 28121aa..c2fb86d 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsDeqpTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsDeqpTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsDeqpTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsDeqpTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-deqp, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsDeqpTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsDeqpTestCases',
+        tag='7.1_r28.x86.CtsDeqpTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsDeqpTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--disable-reboot', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsDeqpTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=86400)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsDeqpTestCases.dEQP-EGL b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsDeqpTestCases.dEQP-EGL
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsDeqpTestCases.dEQP-EGL
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsDeqpTestCases.dEQP-EGL
index 460833a..3e20e90 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsDeqpTestCases.dEQP-EGL
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsDeqpTestCases.dEQP-EGL
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsDeqpTestCases.dEQP-EGL'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsDeqpTestCases.dEQP-EGL'
 ATTRIBUTES = 'suite:arc-cts-deqp, suite:graphics_per-day'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 0
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsDeqpTestCases.dEQP-EGL',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsDeqpTestCases.dEQP-EGL',
+        tag='7.1_r28.x86.CtsDeqpTestCases.dEQP-EGL',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsDeqpTestCases.dEQP-EGL',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-EGL.*', '--disable-reboot', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsDeqpTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=7200)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsDeqpTestCases.dEQP-GLES2 b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsDeqpTestCases.dEQP-GLES2
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsDeqpTestCases.dEQP-GLES2
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsDeqpTestCases.dEQP-GLES2
index 504f21f..3683b11 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsDeqpTestCases.dEQP-GLES2
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsDeqpTestCases.dEQP-GLES2
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsDeqpTestCases.dEQP-GLES2'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsDeqpTestCases.dEQP-GLES2'
 ATTRIBUTES = 'suite:arc-cts-deqp, suite:graphics_per-day'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 0
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsDeqpTestCases.dEQP-GLES2',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsDeqpTestCases.dEQP-GLES2',
+        tag='7.1_r28.x86.CtsDeqpTestCases.dEQP-GLES2',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsDeqpTestCases.dEQP-GLES2',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES2.*', '--disable-reboot', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsDeqpTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=7200)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsDeqpTestCases.dEQP-GLES3 b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsDeqpTestCases.dEQP-GLES3
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsDeqpTestCases.dEQP-GLES3
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsDeqpTestCases.dEQP-GLES3
index e231a16..dad99cf 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsDeqpTestCases.dEQP-GLES3
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsDeqpTestCases.dEQP-GLES3
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsDeqpTestCases.dEQP-GLES3'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsDeqpTestCases.dEQP-GLES3'
 ATTRIBUTES = 'suite:arc-cts-deqp, suite:graphics_per-day'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 0
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsDeqpTestCases.dEQP-GLES3',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsDeqpTestCases.dEQP-GLES3',
+        tag='7.1_r28.x86.CtsDeqpTestCases.dEQP-GLES3',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsDeqpTestCases.dEQP-GLES3',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES3.*', '--disable-reboot', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsDeqpTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=21600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsDeqpTestCases.dEQP-GLES31 b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsDeqpTestCases.dEQP-GLES31
similarity index 85%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsDeqpTestCases.dEQP-GLES31
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsDeqpTestCases.dEQP-GLES31
index ff2222e..94cf627 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsDeqpTestCases.dEQP-GLES31
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsDeqpTestCases.dEQP-GLES31
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsDeqpTestCases.dEQP-GLES31'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsDeqpTestCases.dEQP-GLES31'
 ATTRIBUTES = 'suite:arc-cts-deqp, suite:graphics_per-day'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 0
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsDeqpTestCases.dEQP-GLES31',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsDeqpTestCases.dEQP-GLES31',
+        tag='7.1_r28.x86.CtsDeqpTestCases.dEQP-GLES31',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsDeqpTestCases.dEQP-GLES31',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES31.*', '--disable-reboot', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsDeqpTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=43200)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsDeqpTestCases.dEQP-VK b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsDeqpTestCases.dEQP-VK
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsDeqpTestCases.dEQP-VK
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsDeqpTestCases.dEQP-VK
index 18dd7a0..26a8f11 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsDeqpTestCases.dEQP-VK
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsDeqpTestCases.dEQP-VK
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsDeqpTestCases.dEQP-VK'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsDeqpTestCases.dEQP-VK'
 ATTRIBUTES = 'suite:arc-cts-deqp, suite:graphics_per-day'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 0
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsDeqpTestCases.dEQP-VK',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsDeqpTestCases.dEQP-VK',
+        tag='7.1_r28.x86.CtsDeqpTestCases.dEQP-VK',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsDeqpTestCases.dEQP-VK',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-VK.*', '--disable-reboot', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsDeqpTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=43200)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsDevice b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsDevice
similarity index 88%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsDevice
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsDevice
index 5cfcbdb..3c15c2d 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsDevice
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsDevice
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsDevice'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsDevice'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsDevice',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsDevice',
+        tag='7.1_r28.x86.CtsDevice',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsDevice',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeviceAdminUninstallerTestCases', '--include-filter', 'CtsDevicePolicyManagerTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsDevice',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=10800)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsDisplayTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsDisplayTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsDisplayTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsDisplayTestCases
index bca7b9a..69267a9 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsDisplayTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsDisplayTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsDisplayTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsDisplayTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsDisplayTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsDisplayTestCases',
+        tag='7.1_r28.x86.CtsDisplayTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsDisplayTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDisplayTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsDisplayTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsDpi b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsDpi
similarity index 88%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsDpi
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsDpi
index 706715b..d32a415 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsDpi
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsDpi
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsDpi'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsDpi'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsDpi',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsDpi',
+        tag='7.1_r28.x86.CtsDpi',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsDpi',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDpiTestCases', '--include-filter', 'CtsDpiTestCases2', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsDpi',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=5400)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsDragAndDropHostTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsDragAndDropHostTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsDragAndDropHostTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsDragAndDropHostTestCases
index c964fed..071db35 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsDragAndDropHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsDragAndDropHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsDragAndDropHostTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsDragAndDropHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsDragAndDropHostTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsDragAndDropHostTestCases',
+        tag='7.1_r28.x86.CtsDragAndDropHostTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsDragAndDropHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDragAndDropHostTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsDragAndDropHostTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsDramTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsDramTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsDramTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsDramTestCases
index baed02e..f80e42b 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsDramTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsDramTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsDramTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsDramTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsDramTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsDramTestCases',
+        tag='7.1_r28.x86.CtsDramTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsDramTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDramTestCases', '--disable-reboot', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--retry', '{session_id}'],
         target_module='CtsDramTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsDreamsTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsDreamsTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsDreamsTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsDreamsTestCases
index 598d776..1e5bea3 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsDreamsTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsDreamsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsDreamsTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsDreamsTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsDreamsTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsDreamsTestCases',
+        tag='7.1_r28.x86.CtsDreamsTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsDreamsTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDreamsTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsDreamsTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsDrmTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsDrmTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsDrmTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsDrmTestCases
index a5968cc..8f120e5 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsDrmTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsDrmTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsDrmTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsDrmTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsDrmTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsDrmTestCases',
+        tag='7.1_r28.x86.CtsDrmTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsDrmTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDrmTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsDrmTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsDumpsysHostTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsDumpsysHostTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsDumpsysHostTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsDumpsysHostTestCases
index 6523ced..c4234c8 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsDumpsysHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsDumpsysHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsDumpsysHostTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsDumpsysHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsDumpsysHostTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsDumpsysHostTestCases',
+        tag='7.1_r28.x86.CtsDumpsysHostTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsDumpsysHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDumpsysHostTestCases', '--disable-reboot', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--retry', '{session_id}'],
         target_module='CtsDumpsysHostTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsEffectTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsEffectTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsEffectTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsEffectTestCases
index 58b9c81..790f670 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsEffectTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsEffectTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsEffectTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsEffectTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsEffectTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsEffectTestCases',
+        tag='7.1_r28.x86.CtsEffectTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsEffectTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsEffectTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsEffectTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsExternalServiceTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsExternalServiceTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsExternalServiceTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsExternalServiceTestCases
index bfe11a6..5d9f717 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsExternalServiceTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsExternalServiceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsExternalServiceTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsExternalServiceTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsExternalServiceTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsExternalServiceTestCases',
+        tag='7.1_r28.x86.CtsExternalServiceTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsExternalServiceTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsExternalServiceTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsExternalServiceTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsFileSystemTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsFileSystemTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsFileSystemTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsFileSystemTestCases
index 2f6eed5..e054c53 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsFileSystemTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsFileSystemTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsFileSystemTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsFileSystemTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsFileSystemTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsFileSystemTestCases',
+        tag='7.1_r28.x86.CtsFileSystemTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsFileSystemTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsFileSystemTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsFileSystemTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=9000)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsFragmentTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsFragmentTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsFragmentTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsFragmentTestCases
index 6e013a5..e861c8b 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsFragmentTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsFragmentTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsFragmentTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsFragmentTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsFragmentTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsFragmentTestCases',
+        tag='7.1_r28.x86.CtsFragmentTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsFragmentTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsFragmentTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsFragmentTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsGestureTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsGestureTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsGestureTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsGestureTestCases
index 8164543..54e6ec3 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsGestureTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsGestureTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsGestureTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsGestureTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsGestureTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsGestureTestCases',
+        tag='7.1_r28.x86.CtsGestureTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsGestureTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsGestureTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsGestureTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsGraphics b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsGraphics
similarity index 88%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsGraphics
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsGraphics
index 219dce6..ba6b2b3 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsGraphics
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsGraphics
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsGraphics'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsGraphics'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsGraphics',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsGraphics',
+        tag='7.1_r28.x86.CtsGraphics',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsGraphics',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsGraphics2TestCases', '--include-filter', 'CtsGraphicsTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsGraphics',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=5400)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsHardwareTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsHardwareTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsHardwareTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsHardwareTestCases
index d862975..a293800 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsHardwareTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsHardwareTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsHardwareTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsHardwareTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational3'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsHardwareTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsHardwareTestCases',
+        tag='7.1_r28.x86.CtsHardwareTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsHardwareTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHardwareTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsHardwareTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=10800)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsHostside b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsHostside
similarity index 88%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsHostside
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsHostside
index 1e1d8e9..990667b 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsHostside
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsHostside
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsHostside'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsHostside'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsHostside',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsHostside',
+        tag='7.1_r28.x86.CtsHostside',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsHostside',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHostsideNetworkTests', '--include-filter', 'CtsHostsideNumberBlockingTestCases', '--include-filter', 'CtsHostsideTvTests', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsHostside',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=7200)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsIcuTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsIcuTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsIcuTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsIcuTestCases
index c7b0b0c..4181797 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsIcuTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsIcuTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsIcuTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsIcuTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsIcuTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsIcuTestCases',
+        tag='7.1_r28.x86.CtsIcuTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsIcuTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsIcuTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsIcuTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=7200)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsJankDeviceTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsJankDeviceTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsJankDeviceTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsJankDeviceTestCases
index 41cf1a3..996ab88 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsJankDeviceTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsJankDeviceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsJankDeviceTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsJankDeviceTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsJankDeviceTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsJankDeviceTestCases',
+        tag='7.1_r28.x86.CtsJankDeviceTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsJankDeviceTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJankDeviceTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsJankDeviceTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsJdwp b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsJdwp
similarity index 88%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsJdwp
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsJdwp
index c09070d..d85251e 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsJdwp
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsJdwp
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsJdwp'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsJdwp'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsJdwp',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsJdwp',
+        tag='7.1_r28.x86.CtsJdwp',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsJdwp',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJdwpSecurityHostTestCases', '--include-filter', 'CtsJdwpTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsJdwp',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=5400)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsJniTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsJniTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsJniTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsJniTestCases
index 3052177..e163ead 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsJniTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsJniTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsJniTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsJniTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsJniTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsJniTestCases',
+        tag='7.1_r28.x86.CtsJniTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsJniTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJniTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsJniTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsJobSchedulerTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsJobSchedulerTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsJobSchedulerTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsJobSchedulerTestCases
index e2aa264..4212ef3 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsJobSchedulerTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsJobSchedulerTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsJobSchedulerTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsJobSchedulerTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsJobSchedulerTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsJobSchedulerTestCases',
+        tag='7.1_r28.x86.CtsJobSchedulerTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsJobSchedulerTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJobSchedulerTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsJobSchedulerTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-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_N/control.7.1_r27.x86.CtsKeystoreTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsKeystoreTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsKeystoreTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsKeystoreTestCases
index 333c239..32fd70f 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsKeystoreTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsKeystoreTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsKeystoreTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsKeystoreTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsKeystoreTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsKeystoreTestCases',
+        tag='7.1_r28.x86.CtsKeystoreTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsKeystoreTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsKeystoreTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsKeystoreTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsLeanbackJankTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsLeanbackJankTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsLeanbackJankTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsLeanbackJankTestCases
index 7198d66..f780815 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsLeanbackJankTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsLeanbackJankTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsLeanbackJankTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsLeanbackJankTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsLeanbackJankTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsLeanbackJankTestCases',
+        tag='7.1_r28.x86.CtsLeanbackJankTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsLeanbackJankTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLeanbackJankTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsLeanbackJankTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsLibcore b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsLibcore
similarity index 89%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsLibcore
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsLibcore
index 074c565..f59104c 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsLibcore
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsLibcore
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsLibcore'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsLibcore'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1, suite:vmtest-informational3'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsLibcore',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsLibcore',
+        tag='7.1_r28.x86.CtsLibcore',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsLibcore',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLibcoreLegacy22TestCases', '--include-filter', 'CtsLibcoreOjTestCases', '--include-filter', 'CtsLibcoreOkHttpTestCases', '--include-filter', 'CtsLibcoreTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsLibcore',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=19800)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsLocation b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsLocation
similarity index 88%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsLocation
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsLocation
index aedd26d..5ac198e 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsLocation
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsLocation
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsLocation'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsLocation'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsLocation',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsLocation',
+        tag='7.1_r28.x86.CtsLocation',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsLocation',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLocation2TestCases', '--include-filter', 'CtsLocationTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsLocation',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=5400)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsMediaStressTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsMediaStressTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsMediaStressTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsMediaStressTestCases
index 40a0975..ad71967 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsMediaStressTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsMediaStressTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsMediaStressTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsMediaStressTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational2'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=True,
-        tag='7.1_r27.x86.CtsMediaStressTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsMediaStressTestCases',
+        tag='7.1_r28.x86.CtsMediaStressTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsMediaStressTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaStressTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsMediaStressTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=21600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsMediaTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsMediaTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsMediaTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsMediaTestCases
index 318c100..103e1e0 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsMediaTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsMediaTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsMediaTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsMediaTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational2'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsMediaTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsMediaTestCases',
+        tag='7.1_r28.x86.CtsMediaTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsMediaTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsMediaTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         login_precondition_commands=['lsblk -do NAME,RM | sed -n s/1$//p | xargs -n1 eject'],
         timeout=21600)
 
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsMidiTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsMidiTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsMidiTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsMidiTestCases
index a4c8e32..cb9d0ed 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsMidiTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsMidiTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsMidiTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsMidiTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsMidiTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsMidiTestCases',
+        tag='7.1_r28.x86.CtsMidiTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsMidiTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMidiTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsMidiTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsMonkeyTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsMonkeyTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsMonkeyTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsMonkeyTestCases
index dd8d8a9..866b4b9 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsMonkeyTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsMonkeyTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsMonkeyTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsMonkeyTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsMonkeyTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsMonkeyTestCases',
+        tag='7.1_r28.x86.CtsMonkeyTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsMonkeyTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMonkeyTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsMonkeyTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsMultiUser b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsMultiUser
similarity index 88%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsMultiUser
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsMultiUser
index 8c52c49..a0941f4 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsMultiUser
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsMultiUser
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsMultiUser'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsMultiUser'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsMultiUser',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsMultiUser',
+        tag='7.1_r28.x86.CtsMultiUser',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsMultiUser',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMultiUserHostTestCases', '--include-filter', 'CtsMultiUserTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsMultiUser',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=5400)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsNative b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsNative
similarity index 89%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsNative
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsNative
index 27903e9..0aab08f 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsNative
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsNative
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsNative'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsNative'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsNative',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsNative',
+        tag='7.1_r28.x86.CtsNative',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsNative',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNativeMediaSlTestCases', '--include-filter', 'CtsNativeMediaXaTestCases', '--include-filter', 'CtsNativeNetTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsNative',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=7200)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsNdefTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsNdefTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsNdefTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsNdefTestCases
index b3fb32f..c8695f4 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsNdefTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsNdefTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsNdefTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsNdefTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsNdefTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsNdefTestCases',
+        tag='7.1_r28.x86.CtsNdefTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsNdefTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNdefTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsNdefTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsNet b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsNet
similarity index 94%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsNet
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsNet
index cd50f03..579a4ab 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsNet
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsNet
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsNet'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsNet'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsNet',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsNet',
+        tag='7.1_r28.x86.CtsNet',
+        test_name='cheets_CTS_N.7.1_r28.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', 'CtsNetSecConfigResourcesSrcTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficFalseTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficTrueTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases', '--include-filter', 'CtsNetTestCases', '--include-filter', 'CtsNetTestCasesLegacyApi22', '--include-filter', 'CtsNetTestCasesLegacyPermission22', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsNet',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=28800)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsOpenG b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsOpenG
similarity index 89%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsOpenG
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsOpenG
index cbfaea7..3152b92 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsOpenG
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsOpenG
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsOpenG'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsOpenG'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsOpenG',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsOpenG',
+        tag='7.1_r28.x86.CtsOpenG',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsOpenG',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsOpenGLTestCases', '--include-filter', 'CtsOpenGlPerf2TestCases', '--include-filter', 'CtsOpenGlPerfTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsOpenG',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=7200)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsOs b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsOs
similarity index 89%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsOs
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsOs
index fcd34e9..fd38eb5 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsOs
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsOs
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsOs'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsOs'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsOs',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsOs',
+        tag='7.1_r28.x86.CtsOs',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsOs',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsOsHostTestCases', '--include-filter', 'CtsOsTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsOs',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-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_N/control.7.1_r27.x86.CtsPermission b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsPermission
similarity index 88%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsPermission
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsPermission
index 3e7bb8a..24bb55a 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsPermission
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsPermission
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsPermission'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsPermission'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsPermission',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsPermission',
+        tag='7.1_r28.x86.CtsPermission',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsPermission',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPermission2TestCases', '--include-filter', 'CtsPermissionTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsPermission',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=5400)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsPreference b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsPreference
similarity index 88%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsPreference
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsPreference
index fb2d652..d318812 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsPreference
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsPreference
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsPreference'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsPreference'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsPreference',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsPreference',
+        tag='7.1_r28.x86.CtsPreference',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsPreference',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPreference2TestCases', '--include-filter', 'CtsPreferenceTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsPreference',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=5400)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsPrintTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsPrintTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsPrintTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsPrintTestCases
index df169ad..db5aad0 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsPrintTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsPrintTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsPrintTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsPrintTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsPrintTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsPrintTestCases',
+        tag='7.1_r28.x86.CtsPrintTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsPrintTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPrintTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsPrintTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=10800)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsProviderTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsProviderTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsProviderTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsProviderTestCases
index d632d94..4aac3e9 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsProviderTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsProviderTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsProviderTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsProviderTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsProviderTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsProviderTestCases',
+        tag='7.1_r28.x86.CtsProviderTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsProviderTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsProviderTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsProviderTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-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_N/control.7.1_r27.x86.CtsRenderscript b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsRenderscript
similarity index 87%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsRenderscript
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsRenderscript
index 3544b7b..c0e6a1a 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsRenderscript
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsRenderscript
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsRenderscript'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsRenderscript'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsRenderscript',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsRenderscript',
+        tag='7.1_r28.x86.CtsRenderscript',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsRenderscript',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsRenderscriptLegacyTestCases', '--include-filter', 'CtsRenderscriptTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsRenderscript',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=5400)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsRetailDemoHostTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsRetailDemoHostTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsRetailDemoHostTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsRetailDemoHostTestCases
index ca128ec..60215eb 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsRetailDemoHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsRetailDemoHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsRetailDemoHostTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsRetailDemoHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsRetailDemoHostTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsRetailDemoHostTestCases',
+        tag='7.1_r28.x86.CtsRetailDemoHostTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsRetailDemoHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsRetailDemoHostTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsRetailDemoHostTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsRs b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsRs
similarity index 89%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsRs
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsRs
index e03b9ab..9b9c471 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsRs
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsRs
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsRs'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsRs'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsRs',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsRs',
+        tag='7.1_r28.x86.CtsRs',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsRs',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsRsBlasTestCases', '--include-filter', 'CtsRsCppTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsRs',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=5400)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsSample b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsSample
similarity index 88%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsSample
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsSample
index 09c64fc..d083e24 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsSample
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsSample
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsSample'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsSample'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsSample',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsSample',
+        tag='7.1_r28.x86.CtsSample',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsSample',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSampleDeviceTestCases', '--include-filter', 'CtsSampleHostTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsSample',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=5400)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsSaxTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsSaxTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsSaxTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsSaxTestCases
index dd9ebea..4fa3ecc 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsSaxTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsSaxTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsSaxTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsSaxTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsSaxTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsSaxTestCases',
+        tag='7.1_r28.x86.CtsSaxTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsSaxTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSaxTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsSaxTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsSecurity b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsSecurity
similarity index 88%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsSecurity
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsSecurity
index 4c49ef6..10e6ad2 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsSecurity
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsSecurity
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsSecurity'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsSecurity'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsSecurity',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsSecurity',
+        tag='7.1_r28.x86.CtsSecurity',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsSecurity',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecurityHostTestCases', '--include-filter', 'CtsSecurityTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsSecurity',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         precondition_commands=['echo 3 > /proc/sys/kernel/perf_event_paranoid'],
         timeout=10800)
 
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsServicesHostTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsServicesHostTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsServicesHostTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsServicesHostTestCases
index baaa306..7f6bde4 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsServicesHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsServicesHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsServicesHostTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsServicesHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsServicesHostTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsServicesHostTestCases',
+        tag='7.1_r28.x86.CtsServicesHostTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsServicesHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsServicesHostTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsServicesHostTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsShortcut b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsShortcut
similarity index 88%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsShortcut
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsShortcut
index 81a9ca9..a2c33f7 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsShortcut
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsShortcut
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsShortcut'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsShortcut'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsShortcut',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsShortcut',
+        tag='7.1_r28.x86.CtsShortcut',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsShortcut',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsShortcutHostTestCases', '--include-filter', 'CtsShortcutManagerTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsShortcut',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=9000)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsSignatureTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsSignatureTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsSignatureTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsSignatureTestCases
index 66d263b..a437151 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsSignatureTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsSignatureTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsSignatureTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsSignatureTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsSignatureTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsSignatureTestCases',
+        tag='7.1_r28.x86.CtsSignatureTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsSignatureTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSignatureTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsSignatureTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsSimpleCpuTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsSimpleCpuTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsSimpleCpuTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsSimpleCpuTestCases
index e4e5fab..edb43f9 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsSimpleCpuTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsSimpleCpuTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsSimpleCpuTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsSimpleCpuTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsSimpleCpuTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsSimpleCpuTestCases',
+        tag='7.1_r28.x86.CtsSimpleCpuTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsSimpleCpuTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSimpleCpuTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsSimpleCpuTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsSimpleperfTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsSimpleperfTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsSimpleperfTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsSimpleperfTestCases
index ba70e75..87a56cc 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsSimpleperfTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsSimpleperfTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsSimpleperfTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsSimpleperfTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsSimpleperfTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsSimpleperfTestCases',
+        tag='7.1_r28.x86.CtsSimpleperfTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsSimpleperfTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSimpleperfTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsSimpleperfTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsSpeechTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsSpeechTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsSpeechTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsSpeechTestCases
index dac466a..914da31 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsSpeechTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsSpeechTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsSpeechTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsSpeechTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsSpeechTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsSpeechTestCases',
+        tag='7.1_r28.x86.CtsSpeechTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsSpeechTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSpeechTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsSpeechTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsSustainedPerformanceHostTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsSustainedPerformanceHostTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsSustainedPerformanceHostTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsSustainedPerformanceHostTestCases
index d264572..d155e17 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsSustainedPerformanceHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsSustainedPerformanceHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsSustainedPerformanceHostTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsSustainedPerformanceHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsSustainedPerformanceHostTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsSustainedPerformanceHostTestCases',
+        tag='7.1_r28.x86.CtsSustainedPerformanceHostTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsSustainedPerformanceHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSustainedPerformanceHostTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsSustainedPerformanceHostTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsSystem b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsSystem
similarity index 89%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsSystem
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsSystem
index c16ab15..b2f271b 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsSystem
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsSystem
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsSystem'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsSystem'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsSystem',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsSystem',
+        tag='7.1_r28.x86.CtsSystem',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsSystem',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSystemIntentTestCases', '--include-filter', 'CtsSystemUiHostTestCases', '--include-filter', 'CtsSystemUiTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsSystem',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=7200)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsTelecom b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsTelecom
similarity index 88%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsTelecom
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsTelecom
index c69ab7f..ed7eded 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsTelecom
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsTelecom
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsTelecom'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsTelecom'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsTelecom',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsTelecom',
+        tag='7.1_r28.x86.CtsTelecom',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsTelecom',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTelecomTestCases', '--include-filter', 'CtsTelecomTestCases2', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsTelecom',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=5400)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsTelephony b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsTelephony
similarity index 88%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsTelephony
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsTelephony
index 22745eb..8424376 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsTelephony
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsTelephony
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsTelephony'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsTelephony'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsTelephony',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsTelephony',
+        tag='7.1_r28.x86.CtsTelephony',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsTelephony',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTelephony2TestCases', '--include-filter', 'CtsTelephonyTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsTelephony',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=5400)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsTextTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsTextTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsTextTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsTextTestCases
index 2eea4e1..fe62834 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsTextTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsTextTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsTextTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsTextTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsTextTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsTextTestCases',
+        tag='7.1_r28.x86.CtsTextTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsTextTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTextTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsTextTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsTextureViewTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsTextureViewTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsTextureViewTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsTextureViewTestCases
index 197b1c1..192933d 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsTextureViewTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsTextureViewTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsTextureViewTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsTextureViewTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsTextureViewTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsTextureViewTestCases',
+        tag='7.1_r28.x86.CtsTextureViewTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsTextureViewTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTextureViewTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsTextureViewTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsTheme b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsTheme
similarity index 89%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsTheme
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsTheme
index 5277963..654909c 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsTheme
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsTheme
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsTheme'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsTheme'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1, suite:vmtest-informational3'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsTheme',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsTheme',
+        tag='7.1_r28.x86.CtsTheme',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsTheme',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsThemeDeviceTestCases', '--include-filter', 'CtsThemeHostTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsTheme',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=25200)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsToast b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsToast
similarity index 88%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsToast
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsToast
index a97ad46..89f09ee 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsToast
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsToast
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsToast'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsToast'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsToast',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsToast',
+        tag='7.1_r28.x86.CtsToast',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsToast',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsToastLegacyTestCases', '--include-filter', 'CtsToastTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsToast',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=5400)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsTransitionTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsTransitionTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsTransitionTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsTransitionTestCases
index 2c723d2..4ae6a97 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsTransitionTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsTransitionTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsTransitionTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsTransitionTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsTransitionTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsTransitionTestCases',
+        tag='7.1_r28.x86.CtsTransitionTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsTransitionTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTransitionTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsTransitionTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsTrustedVoiceHostTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsTrustedVoiceHostTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsTrustedVoiceHostTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsTrustedVoiceHostTestCases
index 0b3866b..bca7f45 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsTrustedVoiceHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsTrustedVoiceHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsTrustedVoiceHostTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsTrustedVoiceHostTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsTrustedVoiceHostTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsTrustedVoiceHostTestCases',
+        tag='7.1_r28.x86.CtsTrustedVoiceHostTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsTrustedVoiceHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTrustedVoiceHostTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsTrustedVoiceHostTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsTv b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsTv
similarity index 89%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsTv
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsTv
index 87d3d53..218d3d3 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsTv
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsTv
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsTv'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsTv'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsTv',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsTv',
+        tag='7.1_r28.x86.CtsTv',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsTv',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTvProviderTestCases', '--include-filter', 'CtsTvTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsTv',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=5400)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsUi b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsUi
similarity index 90%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsUi
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsUi
index 1a81787..c4a28de 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsUi
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsUi
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsUi'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsUi'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsUi',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsUi',
+        tag='7.1_r28.x86.CtsUi',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsUi',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUiAutomationTestCases', '--include-filter', 'CtsUiDeviceTestCases', '--include-filter', 'CtsUiHostTestCases', '--include-filter', 'CtsUiRenderingTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsUi',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=9000)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsUidIsolationTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsUidIsolationTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsUidIsolationTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsUidIsolationTestCases
index 7f77c6c..f1a4d58 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsUidIsolationTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsUidIsolationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsUidIsolationTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsUidIsolationTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsUidIsolationTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsUidIsolationTestCases',
+        tag='7.1_r28.x86.CtsUidIsolationTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsUidIsolationTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUidIsolationTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsUidIsolationTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsUsageStatsTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsUsageStatsTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsUsageStatsTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsUsageStatsTestCases
index ffac2ba..656d8ba 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsUsageStatsTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsUsageStatsTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsUsageStatsTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsUsageStatsTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsUsageStatsTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsUsageStatsTestCases',
+        tag='7.1_r28.x86.CtsUsageStatsTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsUsageStatsTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUsageStatsTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsUsageStatsTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsUsbTests b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsUsbTests
similarity index 87%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsUsbTests
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsUsbTests
index e1e2fc0..89935c1 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsUsbTests
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsUsbTests
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsUsbTests'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsUsbTests'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsUsbTests',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsUsbTests',
+        tag='7.1_r28.x86.CtsUsbTests',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsUsbTests',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUsbTests', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsUsbTests',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsUtilTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsUtilTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsUtilTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsUtilTestCases
index 79632e4..bb77c7b 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsUtilTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsUtilTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsUtilTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsUtilTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsUtilTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsUtilTestCases',
+        tag='7.1_r28.x86.CtsUtilTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsUtilTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUtilTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsUtilTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsVideoTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsVideoTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsVideoTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsVideoTestCases
index 7aaca46..88cb218 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsVideoTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsVideoTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsVideoTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsVideoTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsVideoTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsVideoTestCases',
+        tag='7.1_r28.x86.CtsVideoTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsVideoTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsVideoTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsVideoTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsViewTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsViewTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsViewTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsViewTestCases
index ef3cdf5..f5e24a9 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsViewTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsViewTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsViewTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsViewTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsViewTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsViewTestCases',
+        tag='7.1_r28.x86.CtsViewTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsViewTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsViewTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsViewTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsVmTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsVmTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsVmTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsVmTestCases
index c88e2c2..5380df3 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsVmTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsVmTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsVmTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsVmTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsVmTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsVmTestCases',
+        tag='7.1_r28.x86.CtsVmTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsVmTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsVmTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsVmTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=5400)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsVoice b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsVoice
similarity index 88%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsVoice
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsVoice
index ed97c11..b0ecfba 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsVoice
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsVoice
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsVoice'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsVoice'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsVoice',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsVoice',
+        tag='7.1_r28.x86.CtsVoice',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsVoice',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsVoiceInteractionTestCases', '--include-filter', 'CtsVoiceSettingsTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsVoice',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=5400)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsVrTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsVrTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsVrTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsVrTestCases
index afe1383..c11ce4b 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsVrTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsVrTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsVrTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsVrTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsVrTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsVrTestCases',
+        tag='7.1_r28.x86.CtsVrTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsVrTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsVrTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsVrTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsWebkitTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsWebkitTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsWebkitTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsWebkitTestCases
index d1ebc07..a3e3b5f 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsWebkitTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsWebkitTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsWebkitTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsWebkitTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsWebkitTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsWebkitTestCases',
+        tag='7.1_r28.x86.CtsWebkitTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsWebkitTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsWebkitTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsWebkitTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsWidgetTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsWidgetTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsWidgetTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsWidgetTestCases
index 73b199d..a97c823 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.CtsWidgetTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.CtsWidgetTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.CtsWidgetTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.CtsWidgetTestCases'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.CtsWidgetTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.CtsWidgetTestCases',
+        tag='7.1_r28.x86.CtsWidgetTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.CtsWidgetTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsWidgetTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='CtsWidgetTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=3600)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.all.CtsAadbHostTestCases_-_CtsAccountManagerTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.all.CtsAadbHostTestCases_-_CtsAccountManagerTestCases
similarity index 88%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.all.CtsAadbHostTestCases_-_CtsAccountManagerTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.all.CtsAadbHostTestCases_-_CtsAccountManagerTestCases
index 6e6479e..0186e2f 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.all.CtsAadbHostTestCases_-_CtsAccountManagerTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.all.CtsAadbHostTestCases_-_CtsAccountManagerTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.all.CtsAadbHostTestCases_-_CtsAccountManagerTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.all.CtsAadbHostTestCases_-_CtsAccountManagerTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         iterations=1,
         max_retry=9,
         needs_push_media=False,
-        tag='7.1_r27.x86.all.CtsAadbHostTestCases_-_CtsAccountManagerTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.all.CtsAadbHostTestCases_-_CtsAccountManagerTestCases',
+        tag='7.1_r28.x86.all.CtsAadbHostTestCases_-_CtsAccountManagerTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.all.CtsAadbHostTestCases_-_CtsAccountManagerTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAadbHostTestCases', '--include-filter', 'CtsAbiOverrideHostTestCases', '--include-filter', 'CtsAccelerationTestCases', '--include-filter', 'CtsAccessibilityServiceTestCases', '--include-filter', 'CtsAccessibilityTestCases', '--include-filter', 'CtsAccountManagerTestCases', '--disable-reboot', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--retry', '{session_id}'],
         target_module='all.CtsAadbHostTestCases_-_CtsAccountManagerTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=172800)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.all.CtsAdminTestCases_-_CtsDatabaseTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.all.CtsAdminTestCases_-_CtsDatabaseTestCases
similarity index 92%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.all.CtsAdminTestCases_-_CtsDatabaseTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.all.CtsAdminTestCases_-_CtsDatabaseTestCases
index abc776f..dc75e09 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.all.CtsAdminTestCases_-_CtsDatabaseTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.all.CtsAdminTestCases_-_CtsDatabaseTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.all.CtsAdminTestCases_-_CtsDatabaseTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.all.CtsAdminTestCases_-_CtsDatabaseTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -23,14 +23,14 @@
         max_retry=9,
         enable_default_apps=True,
         needs_push_media=False,
-        tag='7.1_r27.x86.all.CtsAdminTestCases_-_CtsDatabaseTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.all.CtsAdminTestCases_-_CtsDatabaseTestCases',
+        tag='7.1_r28.x86.all.CtsAdminTestCases_-_CtsDatabaseTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.all.CtsAdminTestCases_-_CtsDatabaseTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAdminTestCases', '--include-filter', 'CtsAlarmClockTestCases', '--include-filter', 'CtsAndroidAppTestCases', '--include-filter', 'CtsAnimationTestCases', '--include-filter', 'CtsAppSecurityHostTestCases', '--include-filter', 'CtsAppTestCases', '--include-filter', 'CtsAppUsageHostTestCases', '--include-filter', 'CtsAppWidgetTestCases', '--include-filter', 'CtsAslrMallocTestCases', '--include-filter', 'CtsAssistTestCases', '--include-filter', 'CtsAtraceHostTestCases', '--include-filter', 'CtsBackupHostTestCases', '--include-filter', 'CtsBackupTestCases', '--include-filter', 'CtsBionicTestCases', '--include-filter', 'CtsBluetoothTestCases', '--include-filter', 'CtsCalendarcommon2TestCases', '--include-filter', 'CtsCameraTestCases', '--include-filter', 'CtsCarTestCases', '--include-filter', 'CtsCarrierApiTestCases', '--include-filter', 'CtsCompilationTestCases', '--include-filter', 'CtsContentTestCases', '--include-filter', 'CtsCppToolsTestCases', '--include-filter', 'CtsDatabaseTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='all.CtsAdminTestCases_-_CtsDatabaseTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         login_precondition_commands=['lsblk -do NAME,RM | sed -n s/1$//p | xargs -n1 eject'],
         timeout=172800)
 
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases
similarity index 85%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases
index 1b92eb3..023516e 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         iterations=1,
         max_retry=9,
         needs_push_media=False,
-        tag='7.1_r27.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases',
+        tag='7.1_r28.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--disable-reboot', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='all.CtsDeqpTestCases_-_CtsDeqpTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=172800)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.all.CtsDeviceAdminUninstallerTestCases_-_CtsExternalServiceTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.all.CtsDeviceAdminUninstallerTestCases_-_CtsExternalServiceTestCases
similarity index 90%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.all.CtsDeviceAdminUninstallerTestCases_-_CtsExternalServiceTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.all.CtsDeviceAdminUninstallerTestCases_-_CtsExternalServiceTestCases
index 070ed85..57e41f3 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.all.CtsDeviceAdminUninstallerTestCases_-_CtsExternalServiceTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.all.CtsDeviceAdminUninstallerTestCases_-_CtsExternalServiceTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.all.CtsDeviceAdminUninstallerTestCases_-_CtsExternalServiceTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.all.CtsDeviceAdminUninstallerTestCases_-_CtsExternalServiceTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         iterations=1,
         max_retry=9,
         needs_push_media=False,
-        tag='7.1_r27.x86.all.CtsDeviceAdminUninstallerTestCases_-_CtsExternalServiceTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.all.CtsDeviceAdminUninstallerTestCases_-_CtsExternalServiceTestCases',
+        tag='7.1_r28.x86.all.CtsDeviceAdminUninstallerTestCases_-_CtsExternalServiceTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.all.CtsDeviceAdminUninstallerTestCases_-_CtsExternalServiceTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeviceAdminUninstallerTestCases', '--include-filter', 'CtsDevicePolicyManagerTestCases', '--include-filter', 'CtsDisplayTestCases', '--include-filter', 'CtsDpiTestCases', '--include-filter', 'CtsDpiTestCases2', '--include-filter', 'CtsDragAndDropHostTestCases', '--include-filter', 'CtsDramTestCases', '--include-filter', 'CtsDreamsTestCases', '--include-filter', 'CtsDrmTestCases', '--include-filter', 'CtsDumpsysHostTestCases', '--include-filter', 'CtsEffectTestCases', '--include-filter', 'CtsExternalServiceTestCases', '--disable-reboot', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--retry', '{session_id}'],
         target_module='all.CtsDeviceAdminUninstallerTestCases_-_CtsExternalServiceTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=172800)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
similarity index 86%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
index e2cd76d..27164be 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         iterations=1,
         max_retry=9,
         needs_push_media=False,
-        tag='7.1_r27.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases',
+        tag='7.1_r28.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsFileSystemTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='all.CtsFileSystemTestCases_-_CtsFileSystemTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=172800)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.all.CtsFragmentTestCases_-_CtsLocationTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.all.CtsFragmentTestCases_-_CtsLocationTestCases
similarity index 92%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.all.CtsFragmentTestCases_-_CtsLocationTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.all.CtsFragmentTestCases_-_CtsLocationTestCases
index c0c1a88..3c3d9ee 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.all.CtsFragmentTestCases_-_CtsLocationTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.all.CtsFragmentTestCases_-_CtsLocationTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.all.CtsFragmentTestCases_-_CtsLocationTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.all.CtsFragmentTestCases_-_CtsLocationTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         iterations=1,
         max_retry=9,
         needs_push_media=False,
-        tag='7.1_r27.x86.all.CtsFragmentTestCases_-_CtsLocationTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.all.CtsFragmentTestCases_-_CtsLocationTestCases',
+        tag='7.1_r28.x86.all.CtsFragmentTestCases_-_CtsLocationTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.all.CtsFragmentTestCases_-_CtsLocationTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsFragmentTestCases', '--include-filter', 'CtsGestureTestCases', '--include-filter', 'CtsGraphics2TestCases', '--include-filter', 'CtsGraphicsTestCases', '--include-filter', 'CtsHardwareTestCases', '--include-filter', 'CtsHostsideNetworkTests', '--include-filter', 'CtsHostsideNumberBlockingTestCases', '--include-filter', 'CtsHostsideTvTests', '--include-filter', 'CtsIcuTestCases', '--include-filter', 'CtsJankDeviceTestCases', '--include-filter', 'CtsJdwpSecurityHostTestCases', '--include-filter', 'CtsJdwpTestCases', '--include-filter', 'CtsJniTestCases', '--include-filter', 'CtsJobSchedulerTestCases', '--include-filter', 'CtsKeystoreTestCases', '--include-filter', 'CtsLeanbackJankTestCases', '--include-filter', 'CtsLibcoreLegacy22TestCases', '--include-filter', 'CtsLibcoreOjTestCases', '--include-filter', 'CtsLibcoreOkHttpTestCases', '--include-filter', 'CtsLibcoreTestCases', '--include-filter', 'CtsLocation2TestCases', '--include-filter', 'CtsLocationTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='all.CtsFragmentTestCases_-_CtsLocationTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         login_precondition_commands=['lsblk -do NAME,RM | sed -n s/1$//p | xargs -n1 eject'],
         timeout=172800)
 
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.all.CtsMediaStressTestCases_-_CtsMediaTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.all.CtsMediaStressTestCases_-_CtsMediaTestCases
similarity index 87%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.all.CtsMediaStressTestCases_-_CtsMediaTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.all.CtsMediaStressTestCases_-_CtsMediaTestCases
index 07b271b..f456ca3 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.all.CtsMediaStressTestCases_-_CtsMediaTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.all.CtsMediaStressTestCases_-_CtsMediaTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.all.CtsMediaStressTestCases_-_CtsMediaTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.all.CtsMediaStressTestCases_-_CtsMediaTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         iterations=1,
         max_retry=9,
         needs_push_media=True,
-        tag='7.1_r27.x86.all.CtsMediaStressTestCases_-_CtsMediaTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.all.CtsMediaStressTestCases_-_CtsMediaTestCases',
+        tag='7.1_r28.x86.all.CtsMediaStressTestCases_-_CtsMediaTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.all.CtsMediaStressTestCases_-_CtsMediaTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaStressTestCases', '--include-filter', 'CtsMediaTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='all.CtsMediaStressTestCases_-_CtsMediaTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         login_precondition_commands=['lsblk -do NAME,RM | sed -n s/1$//p | xargs -n1 eject'],
         timeout=172800)
 
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.all.CtsMidiTestCases_-_CtsSecurityHostTestCases b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.all.CtsMidiTestCases_-_CtsSecurityHostTestCases
similarity index 95%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.all.CtsMidiTestCases_-_CtsSecurityHostTestCases
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.all.CtsMidiTestCases_-_CtsSecurityHostTestCases
index 0db59af..b443eaa 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.all.CtsMidiTestCases_-_CtsSecurityHostTestCases
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.all.CtsMidiTestCases_-_CtsSecurityHostTestCases
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.all.CtsMidiTestCases_-_CtsSecurityHostTestCases'
+NAME = 'cheets_CTS_N.7.1_r28.x86.all.CtsMidiTestCases_-_CtsSecurityHostTestCases'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         iterations=1,
         max_retry=9,
         needs_push_media=False,
-        tag='7.1_r27.x86.all.CtsMidiTestCases_-_CtsSecurityHostTestCases',
-        test_name='cheets_CTS_N.7.1_r27.x86.all.CtsMidiTestCases_-_CtsSecurityHostTestCases',
+        tag='7.1_r28.x86.all.CtsMidiTestCases_-_CtsSecurityHostTestCases',
+        test_name='cheets_CTS_N.7.1_r28.x86.all.CtsMidiTestCases_-_CtsSecurityHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMidiTestCases', '--include-filter', 'CtsMonkeyTestCases', '--include-filter', 'CtsMultiUserHostTestCases', '--include-filter', 'CtsMultiUserTestCases', '--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', 'CtsNetSecConfigResourcesSrcTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficFalseTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficTrueTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases', '--include-filter', 'CtsNetTestCases', '--include-filter', 'CtsNetTestCasesLegacyApi22', '--include-filter', 'CtsNetTestCasesLegacyPermission22', '--include-filter', 'CtsOpenGLTestCases', '--include-filter', 'CtsOpenGlPerf2TestCases', '--include-filter', 'CtsOpenGlPerfTestCases', '--include-filter', 'CtsOsHostTestCases', '--include-filter', 'CtsOsTestCases', '--include-filter', 'CtsPermission2TestCases', '--include-filter', 'CtsPermissionTestCases', '--include-filter', 'CtsPreference2TestCases', '--include-filter', 'CtsPreferenceTestCases', '--include-filter', 'CtsPrintTestCases', '--include-filter', 'CtsProviderTestCases', '--include-filter', 'CtsRenderscriptLegacyTestCases', '--include-filter', 'CtsRenderscriptTestCases', '--include-filter', 'CtsRetailDemoHostTestCases', '--include-filter', 'CtsRsBlasTestCases', '--include-filter', 'CtsRsCppTestCases', '--include-filter', 'CtsSampleDeviceTestCases', '--include-filter', 'CtsSampleHostTestCases', '--include-filter', 'CtsSaxTestCases', '--include-filter', 'CtsSecurityHostTestCases', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='all.CtsMidiTestCases_-_CtsSecurityHostTestCases',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         login_precondition_commands=['lsblk -do NAME,RM | sed -n s/1$//p | xargs -n1 eject'],
         precondition_commands=['echo 3 > /proc/sys/kernel/perf_event_paranoid'],
         timeout=172800)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.all.CtsSecurityTestCases_-_vm-tests-tf b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.all.CtsSecurityTestCases_-_vm-tests-tf
similarity index 94%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.all.CtsSecurityTestCases_-_vm-tests-tf
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.all.CtsSecurityTestCases_-_vm-tests-tf
index c135eb9..e432522 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.all.CtsSecurityTestCases_-_vm-tests-tf
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.all.CtsSecurityTestCases_-_vm-tests-tf
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.all.CtsSecurityTestCases_-_vm-tests-tf'
+NAME = 'cheets_CTS_N.7.1_r28.x86.all.CtsSecurityTestCases_-_vm-tests-tf'
 ATTRIBUTES = 'suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -22,14 +22,14 @@
         iterations=1,
         max_retry=9,
         needs_push_media=False,
-        tag='7.1_r27.x86.all.CtsSecurityTestCases_-_vm-tests-tf',
-        test_name='cheets_CTS_N.7.1_r27.x86.all.CtsSecurityTestCases_-_vm-tests-tf',
+        tag='7.1_r28.x86.all.CtsSecurityTestCases_-_vm-tests-tf',
+        test_name='cheets_CTS_N.7.1_r28.x86.all.CtsSecurityTestCases_-_vm-tests-tf',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecurityTestCases', '--include-filter', 'CtsServicesHostTestCases', '--include-filter', 'CtsShortcutHostTestCases', '--include-filter', 'CtsShortcutManagerTestCases', '--include-filter', 'CtsSignatureTestCases', '--include-filter', 'CtsSimpleCpuTestCases', '--include-filter', 'CtsSimpleperfTestCases', '--include-filter', 'CtsSpeechTestCases', '--include-filter', 'CtsSustainedPerformanceHostTestCases', '--include-filter', 'CtsSystemIntentTestCases', '--include-filter', 'CtsSystemUiHostTestCases', '--include-filter', 'CtsSystemUiTestCases', '--include-filter', 'CtsTelecomTestCases', '--include-filter', 'CtsTelecomTestCases2', '--include-filter', 'CtsTelephony2TestCases', '--include-filter', 'CtsTelephonyTestCases', '--include-filter', 'CtsTextTestCases', '--include-filter', 'CtsTextureViewTestCases', '--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', 'CtsUiHostTestCases', '--include-filter', 'CtsUiRenderingTestCases', '--include-filter', 'CtsUidIsolationTestCases', '--include-filter', 'CtsUsageStatsTestCases', '--include-filter', 'CtsUsbTests', '--include-filter', 'CtsUtilTestCases', '--include-filter', 'CtsVideoTestCases', '--include-filter', 'CtsViewTestCases', '--include-filter', 'CtsVmTestCases', '--include-filter', 'CtsVoiceInteractionTestCases', '--include-filter', 'CtsVoiceSettingsTestCases', '--include-filter', 'CtsVrTestCases', '--include-filter', 'CtsWebkitTestCases', '--include-filter', 'CtsWidgetTestCases', '--include-filter', 'vm-tests-tf', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='all.CtsSecurityTestCases_-_vm-tests-tf',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=172800)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.tradefed-run-collect-tests-only-internal b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.tradefed-run-collect-tests-only-internal
similarity index 82%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.tradefed-run-collect-tests-only-internal
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.tradefed-run-collect-tests-only-internal
index 7a227ab..5694816 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.tradefed-run-collect-tests-only-internal
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.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_N.7.1_r27.x86.tradefed-run-collect-tests-only-internal'
+NAME = 'cheets_CTS_N.7.1_r28.x86.tradefed-run-collect-tests-only-internal'
 ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-qual'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 0
@@ -22,14 +22,14 @@
         iterations=1,
         max_retry=0,
         needs_push_media=False,
-        tag='7.1_r27.x86.tradefed-run-collect-tests-only-internal',
-        test_name='cheets_CTS_N.7.1_r27.x86.tradefed-run-collect-tests-only-internal',
+        tag='7.1_r28.x86.tradefed-run-collect-tests-only-internal',
+        test_name='cheets_CTS_N.7.1_r28.x86.tradefed-run-collect-tests-only-internal',
         run_template=['run', 'commandAndExit', 'collect-tests-only'],
         retry_template=None,
         target_module=None,
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=2400)
 
 parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.vm-tests-tf b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.vm-tests-tf
similarity index 87%
rename from server/site_tests/cheets_CTS_N/control.7.1_r27.x86.vm-tests-tf
rename to server/site_tests/cheets_CTS_N/control.7.1_r28.x86.vm-tests-tf
index 348cdb9..5d27d6e 100644
--- a/server/site_tests/cheets_CTS_N/control.7.1_r27.x86.vm-tests-tf
+++ b/server/site_tests/cheets_CTS_N/control.7.1_r28.x86.vm-tests-tf
@@ -5,7 +5,7 @@
 # This file has been automatically generated. Do not edit!
 
 AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_N.7.1_r27.x86.vm-tests-tf'
+NAME = 'cheets_CTS_N.7.1_r28.x86.vm-tests-tf'
 ATTRIBUTES = 'suite:arc-cts, suite:vmtest-informational1'
 DEPENDENCIES = 'arc, cts_abi_x86'
 JOB_RETRIES = 1
@@ -21,14 +21,14 @@
         hosts=host_list,
         iterations=1,
         needs_push_media=False,
-        tag='7.1_r27.x86.vm-tests-tf',
-        test_name='cheets_CTS_N.7.1_r27.x86.vm-tests-tf',
+        tag='7.1_r28.x86.vm-tests-tf',
+        test_name='cheets_CTS_N.7.1_r28.x86.vm-tests-tf',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'vm-tests-tf', '--disable-reboot', '--logcat-on-failure', '--skip-device-info'],
         retry_template=['run', 'commandAndExit', 'cts', '--disable-reboot', '--skip-device-info', '--retry', '{session_id}'],
         target_module='vm-tests-tf',
         target_plan=None,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r27-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/N/android-cts-7.1_r28-linux_x86-x86.zip',
         timeout=7200)
 
 parallel_simple(run_CTS, machines)