diff --git a/server/site_tests/cheets_CTS_R/control.11_dev.arm.waivers b/server/site_tests/cheets_CTS_R/control.11_dev.arm.waivers
index 21a4734..faf0271 100644
--- a/server/site_tests/cheets_CTS_R/control.11_dev.arm.waivers
+++ b/server/site_tests/cheets_CTS_R/control.11_dev.arm.waivers
@@ -30,7 +30,7 @@
         target_plan='waivers',
         load_waivers=False,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/R/android-cts-7444722-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/R/android-cts-7588503-linux_x86-arm.zip',
         use_jdk9=True,
         timeout=7200)
 
diff --git a/server/site_tests/cheets_CTS_R/control.11_dev.x86.waivers b/server/site_tests/cheets_CTS_R/control.11_dev.x86.waivers
index d6cc5f4..9c2dcff 100644
--- a/server/site_tests/cheets_CTS_R/control.11_dev.x86.waivers
+++ b/server/site_tests/cheets_CTS_R/control.11_dev.x86.waivers
@@ -30,7 +30,7 @@
         target_plan='waivers',
         load_waivers=False,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/R/android-cts-7444722-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/R/android-cts-7588503-linux_x86-x86.zip',
         use_jdk9=True,
         timeout=14400)
 
diff --git a/server/site_tests/cheets_CTS_R/control.arm.waivers b/server/site_tests/cheets_CTS_R/control.arm.waivers
index 2eb8d36..654a87d 100644
--- a/server/site_tests/cheets_CTS_R/control.arm.waivers
+++ b/server/site_tests/cheets_CTS_R/control.arm.waivers
@@ -31,7 +31,7 @@
         bundle='arm',
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        uri='gs://chromeos-partner-gts/R/android-cts-7444722-linux_x86-arm.zip',
+        uri='gs://chromeos-partner-gts/R/android-cts-7588503-linux_x86-arm.zip',
         use_jdk9=True,
         timeout=7200)
 
diff --git a/server/site_tests/cheets_CTS_R/control.arm.waivers-collect-tests-only b/server/site_tests/cheets_CTS_R/control.arm.waivers-collect-tests-only
index 474191a..a6aa7a5 100644
--- a/server/site_tests/cheets_CTS_R/control.arm.waivers-collect-tests-only
+++ b/server/site_tests/cheets_CTS_R/control.arm.waivers-collect-tests-only
@@ -32,7 +32,7 @@
         bundle='arm',
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        uri='gs://chromeos-partner-gts/R/android-cts-7444722-linux_x86-arm.zip',
+        uri='gs://chromeos-partner-gts/R/android-cts-7588503-linux_x86-arm.zip',
         use_jdk9=True,
         timeout=360)
 
diff --git a/server/site_tests/cheets_CTS_R/control.x86.waivers b/server/site_tests/cheets_CTS_R/control.x86.waivers
index 692d34b..6771c34 100644
--- a/server/site_tests/cheets_CTS_R/control.x86.waivers
+++ b/server/site_tests/cheets_CTS_R/control.x86.waivers
@@ -31,7 +31,7 @@
         bundle='x86',
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        uri='gs://chromeos-partner-gts/R/android-cts-7444722-linux_x86-x86.zip',
+        uri='gs://chromeos-partner-gts/R/android-cts-7588503-linux_x86-x86.zip',
         use_jdk9=True,
         timeout=7200)
 
diff --git a/server/site_tests/cheets_CTS_R/control.x86.waivers-collect-tests-only b/server/site_tests/cheets_CTS_R/control.x86.waivers-collect-tests-only
index fd2b845..e6cef00 100644
--- a/server/site_tests/cheets_CTS_R/control.x86.waivers-collect-tests-only
+++ b/server/site_tests/cheets_CTS_R/control.x86.waivers-collect-tests-only
@@ -32,7 +32,7 @@
         bundle='x86',
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        uri='gs://chromeos-partner-gts/R/android-cts-7444722-linux_x86-x86.zip',
+        uri='gs://chromeos-partner-gts/R/android-cts-7588503-linux_x86-x86.zip',
         use_jdk9=True,
         timeout=360)
 
diff --git a/server/site_tests/cheets_CTS_R/subplans/waivers.xml b/server/site_tests/cheets_CTS_R/subplans/waivers.xml
index c800d98..f4e393a 100644
--- a/server/site_tests/cheets_CTS_R/subplans/waivers.xml
+++ b/server/site_tests/cheets_CTS_R/subplans/waivers.xml
@@ -6,151 +6,33 @@
     is incremented. Otherwise the computation for the canonical list
     of test cases is confused. See b/151779432.
   -->
-  <Entry include="CtsAccessibilityServiceTestCases android.accessibilityservice.cts.TouchExplorerTest#testSlowSwipe_initiatesTouchExploration" />
-  <Entry include="CtsAppTestCases android.app.cts.ActivityManagerProcessStateTest#testCantSaveStateLaunchAndSwitch" />
-  <Entry include="CtsAppTestCases[instant] android.app.cts.ActivityManagerProcessStateTest#testCantSaveStateLaunchAndSwitch" />
-  <Entry include="CtsAutoFillServiceTestCases android.autofillservice.cts.MultiWindowLoginActivityTest#testSplitWindow" />
-  <Entry include="CtsCameraTestCases android.hardware.camera2.cts.PerformanceTest#testSingleCapture" />
-  <Entry include="CtsCameraTestCases[instant] android.hardware.camera2.cts.PerformanceTest#testSingleCapture" />
-  <Entry include="CtsDropBoxManagerTestCases android.dropboxmanager.cts.DropBoxTests#testLowPriorityRateLimitingWithEnabledEntries" />
-  <Entry include="CtsDropBoxManagerTestCases android.dropboxmanager.cts.DropBoxTests#testLowPrioritySustainedRapidEntryLimiting" />
-  <Entry include="CtsGraphicsTestCases android.graphics.cts.AImageDecoderTest#testCropResource[0]" />
-  <Entry include="CtsGraphicsTestCases android.graphics.cts.AImageDecoderTest#testCropResource[1]" />
-  <Entry include="CtsGraphicsTestCases android.graphics.cts.AImageDecoderTest#testCropResource[2]" />
-  <Entry include="CtsGraphicsTestCases android.graphics.cts.AImageDecoderTest#testCropResource[3]" />
-  <Entry include="CtsGraphicsTestCases android.graphics.cts.AImageDecoderTest#testCropResource[4]" />
-  <Entry include="CtsGraphicsTestCases android.graphics.cts.AImageDecoderTest#testCropResource[5]" />
-  <Entry include="CtsGraphicsTestCases android.graphics.cts.AImageDecoderTest#testCropResource[6]" />
-  <Entry include="CtsGraphicsTestCases android.graphics.cts.AImageDecoderTest#testCropResource[7]" />
-  <Entry include="CtsGraphicsTestCases android.graphics.cts.AImageDecoderTest#testCropResource[8]" />
-  <Entry include="CtsGraphicsTestCases android.graphics.cts.AImageDecoderTest#testDecode565Resources[0]" />
-  <Entry include="CtsGraphicsTestCases android.graphics.cts.AImageDecoderTest#testDecode565Resources[1]" />
-  <Entry include="CtsGraphicsTestCases android.graphics.cts.AImageDecoderTest#testDecode565Resources[2]" />
-  <Entry include="CtsGraphicsTestCases android.graphics.cts.AImageDecoderTest#testDecode565Resources[3]" />
-  <Entry include="CtsGraphicsTestCases android.graphics.cts.AImageDecoderTest#testDecode565Resources[4]" />
-  <Entry include="CtsGraphicsTestCases android.graphics.cts.AImageDecoderTest#testDecode565Resources[5]" />
-  <Entry include="CtsGraphicsTestCases android.graphics.cts.AImageDecoderTest#testDecode565Resources[8]" />
-  <Entry include="CtsGraphicsTestCases android.graphics.cts.AImageDecoderTest#testDecodeA8Resources" />
-  <Entry include="CtsGraphicsTestCases android.graphics.cts.AImageDecoderTest#testDecodeResources[0]" />
-  <Entry include="CtsGraphicsTestCases android.graphics.cts.AImageDecoderTest#testDecodeResources[10]" />
-  <Entry include="CtsGraphicsTestCases android.graphics.cts.AImageDecoderTest#testDecodeResources[11]" />
-  <Entry include="CtsGraphicsTestCases android.graphics.cts.AImageDecoderTest#testDecodeResources[12]" />
-  <Entry include="CtsGraphicsTestCases android.graphics.cts.AImageDecoderTest#testDecodeResources[13]" />
-  <Entry include="CtsGraphicsTestCases android.graphics.cts.AImageDecoderTest#testDecodeResources[14]" />
-  <Entry include="CtsGraphicsTestCases android.graphics.cts.AImageDecoderTest#testDecodeResources[15]" />
-  <Entry include="CtsGraphicsTestCases android.graphics.cts.AImageDecoderTest#testDecodeResources[16]" />
-  <Entry include="CtsGraphicsTestCases android.graphics.cts.AImageDecoderTest#testDecodeResources[17]" />
-  <Entry include="CtsGraphicsTestCases android.graphics.cts.AImageDecoderTest#testDecodeResources[1]" />
-  <Entry include="CtsGraphicsTestCases android.graphics.cts.AImageDecoderTest#testDecodeResources[2]" />
-  <Entry include="CtsGraphicsTestCases android.graphics.cts.AImageDecoderTest#testDecodeResources[3]" />
-  <Entry include="CtsGraphicsTestCases android.graphics.cts.AImageDecoderTest#testDecodeResources[4]" />
-  <Entry include="CtsGraphicsTestCases android.graphics.cts.AImageDecoderTest#testDecodeResources[5]" />
-  <Entry include="CtsGraphicsTestCases android.graphics.cts.AImageDecoderTest#testDecodeResources[6]" />
-  <Entry include="CtsGraphicsTestCases android.graphics.cts.AImageDecoderTest#testDecodeResources[7]" />
-  <Entry include="CtsGraphicsTestCases android.graphics.cts.AImageDecoderTest#testDecodeResources[8]" />
-  <Entry include="CtsGraphicsTestCases android.graphics.cts.AImageDecoderTest#testDecodeResources[9]" />
-  <Entry include="CtsGraphicsTestCases android.graphics.cts.ImageDecoderTest#testSetAllocatorDecodeBitmap[0]" />
-  <Entry include="CtsGraphicsTestCases android.graphics.cts.ImageDecoderTest#testSetAllocatorDecodeBitmap[1]" />
-  <Entry include="CtsGraphicsTestCases android.graphics.cts.ImageDecoderTest#testSetAllocatorDecodeBitmap[2]" />
-  <Entry include="CtsGraphicsTestCases android.graphics.cts.ImageDecoderTest#testSetAllocatorDecodeBitmap[3]" />
-  <Entry include="CtsGraphicsTestCases android.graphics.cts.ImageDecoderTest#testSetAllocatorDecodeBitmap[4]" />
-  <Entry include="CtsGraphicsTestCases android.graphics.cts.ImageDecoderTest#testSetAllocatorDecodeBitmap[5]" />
-  <Entry include="CtsGraphicsTestCases android.graphics.cts.ImageDecoderTest#testSetAllocatorDecodeBitmap[6]" />
-  <Entry include="CtsGraphicsTestCases android.graphics.cts.ImageDecoderTest#testSetAllocatorDecodeBitmap[7]" />
-  <Entry include="CtsGraphicsTestCases android.graphics.cts.ImageDecoderTest#testSetAllocatorDecodeBitmap[8]" />
-  <Entry include="CtsGraphicsTestCases[instant] android.graphics.cts.AImageDecoderTest#testCropResource[0]" />
-  <Entry include="CtsGraphicsTestCases[instant] android.graphics.cts.AImageDecoderTest#testCropResource[1]" />
-  <Entry include="CtsGraphicsTestCases[instant] android.graphics.cts.AImageDecoderTest#testCropResource[2]" />
-  <Entry include="CtsGraphicsTestCases[instant] android.graphics.cts.AImageDecoderTest#testCropResource[3]" />
-  <Entry include="CtsGraphicsTestCases[instant] android.graphics.cts.AImageDecoderTest#testCropResource[4]" />
-  <Entry include="CtsGraphicsTestCases[instant] android.graphics.cts.AImageDecoderTest#testCropResource[5]" />
-  <Entry include="CtsGraphicsTestCases[instant] android.graphics.cts.AImageDecoderTest#testCropResource[6]" />
-  <Entry include="CtsGraphicsTestCases[instant] android.graphics.cts.AImageDecoderTest#testCropResource[7]" />
-  <Entry include="CtsGraphicsTestCases[instant] android.graphics.cts.AImageDecoderTest#testCropResource[8]" />
-  <Entry include="CtsGraphicsTestCases[instant] android.graphics.cts.AImageDecoderTest#testDecode565Resources[0]" />
-  <Entry include="CtsGraphicsTestCases[instant] android.graphics.cts.AImageDecoderTest#testDecode565Resources[1]" />
-  <Entry include="CtsGraphicsTestCases[instant] android.graphics.cts.AImageDecoderTest#testDecode565Resources[2]" />
-  <Entry include="CtsGraphicsTestCases[instant] android.graphics.cts.AImageDecoderTest#testDecode565Resources[3]" />
-  <Entry include="CtsGraphicsTestCases[instant] android.graphics.cts.AImageDecoderTest#testDecode565Resources[4]" />
-  <Entry include="CtsGraphicsTestCases[instant] android.graphics.cts.AImageDecoderTest#testDecode565Resources[5]" />
-  <Entry include="CtsGraphicsTestCases[instant] android.graphics.cts.AImageDecoderTest#testDecode565Resources[8]" />
-  <Entry include="CtsGraphicsTestCases[instant] android.graphics.cts.AImageDecoderTest#testDecodeA8Resources" />
-  <Entry include="CtsGraphicsTestCases[instant] android.graphics.cts.AImageDecoderTest#testDecodeResources[0]" />
-  <Entry include="CtsGraphicsTestCases[instant] android.graphics.cts.AImageDecoderTest#testDecodeResources[10]" />
-  <Entry include="CtsGraphicsTestCases[instant] android.graphics.cts.AImageDecoderTest#testDecodeResources[11]" />
-  <Entry include="CtsGraphicsTestCases[instant] android.graphics.cts.AImageDecoderTest#testDecodeResources[12]" />
-  <Entry include="CtsGraphicsTestCases[instant] android.graphics.cts.AImageDecoderTest#testDecodeResources[13]" />
-  <Entry include="CtsGraphicsTestCases[instant] android.graphics.cts.AImageDecoderTest#testDecodeResources[14]" />
-  <Entry include="CtsGraphicsTestCases[instant] android.graphics.cts.AImageDecoderTest#testDecodeResources[15]" />
-  <Entry include="CtsGraphicsTestCases[instant] android.graphics.cts.AImageDecoderTest#testDecodeResources[16]" />
-  <Entry include="CtsGraphicsTestCases[instant] android.graphics.cts.AImageDecoderTest#testDecodeResources[17]" />
-  <Entry include="CtsGraphicsTestCases[instant] android.graphics.cts.AImageDecoderTest#testDecodeResources[1]" />
-  <Entry include="CtsGraphicsTestCases[instant] android.graphics.cts.AImageDecoderTest#testDecodeResources[2]" />
-  <Entry include="CtsGraphicsTestCases[instant] android.graphics.cts.AImageDecoderTest#testDecodeResources[3]" />
-  <Entry include="CtsGraphicsTestCases[instant] android.graphics.cts.AImageDecoderTest#testDecodeResources[4]" />
-  <Entry include="CtsGraphicsTestCases[instant] android.graphics.cts.AImageDecoderTest#testDecodeResources[5]" />
-  <Entry include="CtsGraphicsTestCases[instant] android.graphics.cts.AImageDecoderTest#testDecodeResources[6]" />
-  <Entry include="CtsGraphicsTestCases[instant] android.graphics.cts.AImageDecoderTest#testDecodeResources[7]" />
-  <Entry include="CtsGraphicsTestCases[instant] android.graphics.cts.AImageDecoderTest#testDecodeResources[8]" />
-  <Entry include="CtsGraphicsTestCases[instant] android.graphics.cts.AImageDecoderTest#testDecodeResources[9]" />
-  <Entry include="CtsGraphicsTestCases[instant] android.graphics.cts.ImageDecoderTest#testSetAllocatorDecodeBitmap[0]" />
-  <Entry include="CtsGraphicsTestCases[instant] android.graphics.cts.ImageDecoderTest#testSetAllocatorDecodeBitmap[1]" />
-  <Entry include="CtsGraphicsTestCases[instant] android.graphics.cts.ImageDecoderTest#testSetAllocatorDecodeBitmap[2]" />
-  <Entry include="CtsGraphicsTestCases[instant] android.graphics.cts.ImageDecoderTest#testSetAllocatorDecodeBitmap[3]" />
-  <Entry include="CtsGraphicsTestCases[instant] android.graphics.cts.ImageDecoderTest#testSetAllocatorDecodeBitmap[4]" />
-  <Entry include="CtsGraphicsTestCases[instant] android.graphics.cts.ImageDecoderTest#testSetAllocatorDecodeBitmap[5]" />
-  <Entry include="CtsGraphicsTestCases[instant] android.graphics.cts.ImageDecoderTest#testSetAllocatorDecodeBitmap[6]" />
-  <Entry include="CtsGraphicsTestCases[instant] android.graphics.cts.ImageDecoderTest#testSetAllocatorDecodeBitmap[7]" />
-  <Entry include="CtsGraphicsTestCases[instant] android.graphics.cts.ImageDecoderTest#testSetAllocatorDecodeBitmap[8]" />
+  <Entry include="CtsAppSecurityHostTestCases android.appsecurity.cts.DocumentsTest#testRestrictStorageAccessFrameworkDisabled_notBlockFromTree" />
+  <Entry include="CtsDeqpTestCases dEQP-VK.api.external.memory.android_hardware_buffer.dedicated.host_visible#import_multiple_times" />
+  <Entry include="CtsDeqpTestCases dEQP-VK.api.external.memory.android_hardware_buffer.dedicated.image#bind_export_import_bind" />
+  <Entry include="CtsDeqpTestCases dEQP-VK.api.external.memory.android_hardware_buffer.dedicated.image#export_bind_import_bind" />
+  <Entry include="CtsDeqpTestCases dEQP-VK.api.external.memory.android_hardware_buffer.dedicated.image#export_import_bind_bind" />
+  <Entry include="CtsDeqpTestCases dEQP-VK.api.external.memory.android_hardware_buffer.dedicated.image#info" />
+  <Entry include="CtsDeqpTestCases dEQP-VK.api.external.memory.android_hardware_buffer.image_formats#a2b10g10r10_unorm_pack32" />
+  <Entry include="CtsDeqpTestCases dEQP-VK.api.external.memory.android_hardware_buffer.image_formats#r16g16b16a16_sfloat" />
+  <Entry include="CtsDeqpTestCases dEQP-VK.api.external.memory.android_hardware_buffer.image_formats#r5g6b5_unorm_pack16" />
+  <Entry include="CtsDeqpTestCases dEQP-VK.api.external.memory.android_hardware_buffer.image_formats#r8g8b8a8_unorm" />
+  <Entry include="CtsDeqpTestCases dEQP-VK.api.external.memory.android_hardware_buffer.suballocated.host_visible#import_multiple_times" />
+  <Entry include="CtsDeqpTestCases dEQP-VK.api.external.memory.android_hardware_buffer.suballocated.image#info" />
+  <Entry include="CtsDeqpTestCases dEQP-VK.memory.pipeline_barrier.all#1024_vertex_buffer_stride_2" />
+  <Entry include="CtsDeqpTestCases dEQP-VK.memory.pipeline_barrier.all#1024_vertex_buffer_stride_4" />
+  <Entry include="CtsDeqpTestCases dEQP-VK.memory.pipeline_barrier.all_device#1024_vertex_buffer_stride_2" />
+  <Entry include="CtsDeqpTestCases dEQP-VK.memory.pipeline_barrier.all_device#1024_vertex_buffer_stride_4" />
+  <Entry include="CtsDeqpTestCases dEQP-VK.memory.pipeline_barrier.transfer_dst_image_sampled#1024" />
+  <Entry include="CtsDeqpTestCases dEQP-VK.memory.pipeline_barrier.transfer_dst_storage_image#1024" />
+  <Entry include="CtsDeqpTestCases dEQP-VK.memory.pipeline_barrier.transfer_src_transfer_dst#1024" />
+  <Entry include="CtsDeqpTestCases dEQP-VK.sparse_resources.shader_intrinsics.2d_array_sparse_sample_implicit_lod.r32ui#11_37_3" />
+  <Entry include="CtsDeqpTestCases dEQP-VK.sparse_resources.shader_intrinsics.2d_sparse_fetch.r32i#512_256_1" />
+  <Entry include="CtsDeqpTestCases dEQP-VK.sparse_resources.shader_intrinsics.2d_sparse_fetch.r32ui#512_256_1" />
+  <Entry include="CtsDeqpTestCases dEQP-VK.sparse_resources.shader_intrinsics.2d_sparse_sample_explicit_lod.r32ui#128_128_1" />
+  <Entry include="CtsDeqpTestCases dEQP-VK.sparse_resources.shader_intrinsics.2d_sparse_sample_explicit_lod.r32ui#512_256_1" />
   <Entry include="CtsHardwareTestCases android.hardware.input.cts.tests.MicrosoftSculpttouchTest#testAllMotions" />
-  <Entry include="CtsIncidentHostTestCases com.android.server.cts.GraphicsStatsValidationTest#testJankyDrawFrame" />
-  <Entry include="CtsIncidentHostTestCases[instant] com.android.server.cts.GraphicsStatsValidationTest#testJankyDrawFrame" />
-  <Entry include="CtsKeystoreTestCases android.keystore.cts.KeyAttestationTest#testEcAttestation" />
-  <Entry include="CtsKeystoreTestCases android.keystore.cts.KeyAttestationTest#testEcAttestation_DeviceLocked" />
-  <Entry include="CtsKeystoreTestCases android.keystore.cts.KeyAttestationTest#testRsaAttestation" />
-  <Entry include="CtsKeystoreTestCases android.keystore.cts.KeyAttestationTest#testRsaAttestation_DeviceLocked" />
-  <Entry include="CtsMediaV2TestCases android.mediav2.cts.EncoderColorAspectsTest#testColorAspects[154(video/x-vnd.on2.vp8111)]" />
-  <Entry include="CtsMediaV2TestCases android.mediav2.cts.EncoderColorAspectsTest#testColorAspects[155(video/x-vnd.on2.vp8113)]" />
-  <Entry include="CtsMediaV2TestCases android.mediav2.cts.EncoderColorAspectsTest#testColorAspects[158(video/x-vnd.on2.vp8121)]" />
-  <Entry include="CtsMediaV2TestCases android.mediav2.cts.EncoderColorAspectsTest#testColorAspects[159(video/x-vnd.on2.vp8123)]" />
-  <Entry include="CtsMediaV2TestCases android.mediav2.cts.EncoderColorAspectsTest#testColorAspects[162(video/x-vnd.on2.vp8141)]" />
-  <Entry include="CtsMediaV2TestCases android.mediav2.cts.EncoderColorAspectsTest#testColorAspects[163(video/x-vnd.on2.vp8143)]" />
-  <Entry include="CtsMediaV2TestCases android.mediav2.cts.EncoderColorAspectsTest#testColorAspects[166(video/x-vnd.on2.vp8161)]" />
-  <Entry include="CtsMediaV2TestCases android.mediav2.cts.EncoderColorAspectsTest#testColorAspects[167(video/x-vnd.on2.vp8163)]" />
-  <Entry include="CtsMediaV2TestCases android.mediav2.cts.EncoderColorAspectsTest#testColorAspects[250(video/x-vnd.on2.vp9111)]" />
-  <Entry include="CtsMediaV2TestCases android.mediav2.cts.EncoderColorAspectsTest#testColorAspects[251(video/x-vnd.on2.vp9113)]" />
-  <Entry include="CtsMediaV2TestCases android.mediav2.cts.EncoderColorAspectsTest#testColorAspects[254(video/x-vnd.on2.vp9121)]" />
-  <Entry include="CtsMediaV2TestCases android.mediav2.cts.EncoderColorAspectsTest#testColorAspects[255(video/x-vnd.on2.vp9123)]" />
-  <Entry include="CtsMediaV2TestCases android.mediav2.cts.EncoderColorAspectsTest#testColorAspects[258(video/x-vnd.on2.vp9141)]" />
-  <Entry include="CtsMediaV2TestCases android.mediav2.cts.EncoderColorAspectsTest#testColorAspects[259(video/x-vnd.on2.vp9143)]" />
-  <Entry include="CtsMediaV2TestCases android.mediav2.cts.EncoderColorAspectsTest#testColorAspects[262(video/x-vnd.on2.vp9161)]" />
-  <Entry include="CtsMediaV2TestCases android.mediav2.cts.EncoderColorAspectsTest#testColorAspects[263(video/x-vnd.on2.vp9163)]" />
-  <Entry include="CtsMediaV2TestCases android.mediav2.cts.EncoderColorAspectsTest#testColorAspects[58(video/avc111)]" />
-  <Entry include="CtsMediaV2TestCases android.mediav2.cts.EncoderColorAspectsTest#testColorAspects[59(video/avc113)]" />
-  <Entry include="CtsMediaV2TestCases android.mediav2.cts.EncoderColorAspectsTest#testColorAspects[62(video/avc121)]" />
-  <Entry include="CtsMediaV2TestCases android.mediav2.cts.EncoderColorAspectsTest#testColorAspects[63(video/avc123)]" />
-  <Entry include="CtsMediaV2TestCases android.mediav2.cts.EncoderColorAspectsTest#testColorAspects[66(video/avc141)]" />
-  <Entry include="CtsMediaV2TestCases android.mediav2.cts.EncoderColorAspectsTest#testColorAspects[67(video/avc143)]" />
-  <Entry include="CtsMediaV2TestCases android.mediav2.cts.EncoderColorAspectsTest#testColorAspects[70(video/avc161)]" />
-  <Entry include="CtsMediaV2TestCases android.mediav2.cts.EncoderColorAspectsTest#testColorAspects[71(video/avc163)]" />
-  <Entry include="CtsMediaV2TestCases android.mediav2.cts.EncoderColorAspectsTest#testColorAspects[82(video/avc211)]" />
-  <Entry include="CtsMediaV2TestCases android.mediav2.cts.EncoderColorAspectsTest#testColorAspects[83(video/avc213)]" />
-  <Entry include="CtsMediaV2TestCases android.mediav2.cts.EncoderColorAspectsTest#testColorAspects[86(video/avc221)]" />
-  <Entry include="CtsMediaV2TestCases android.mediav2.cts.EncoderColorAspectsTest#testColorAspects[87(video/avc223)]" />
-  <Entry include="CtsMediaV2TestCases android.mediav2.cts.EncoderColorAspectsTest#testColorAspects[90(video/avc241)]" />
-  <Entry include="CtsMediaV2TestCases android.mediav2.cts.EncoderColorAspectsTest#testColorAspects[91(video/avc243)]" />
-  <Entry include="CtsMediaV2TestCases android.mediav2.cts.EncoderColorAspectsTest#testColorAspects[94(video/avc261)]" />
-  <Entry include="CtsMediaV2TestCases android.mediav2.cts.EncoderColorAspectsTest#testColorAspects[95(video/avc263)]" />
-  <Entry include="CtsOsTestCases android.os.cts.AutoRevokeTest#testUnusedApp_getsPermissionRevoked" />
-  <Entry include="CtsOsTestCases android.os.cts.FileObserverTest#testFileObserver_multipleFilesFull" />
-  <Entry include="CtsSyncAccountAccessOtherCertTestCases com.android.cts.content.CtsSyncAccountAccessOtherCertTestCases#testAccountAccess_otherCertAsAuthenticatorCanNotSeeAccount" />
-  <Entry include="CtsThemeHostTestCases android.theme.cts.ThemeHostTest#testThemes" />
-  <Entry include="CtsWidgetTestCases android.widget.cts.ToastTest#testCustomToastBlocked_whenBehindTranslucentActivity" />
-  <Entry include="CtsWidgetTestCases[instant] android.widget.cts.ToastTest#testCustomToastBlocked_whenBehindTranslucentActivity" />
+  <Entry include="CtsOsTestCases android.os.cts.EnvironmentTest#testHidePid2" />
+  <Entry include="CtsWifiTestCases android.net.wifi.cts.WifiManagerTest#testWifiScanTimestamp" />
   <Entry include="CtsWindowManagerDeviceTestCases android.server.wm.AssistantStackTests#testAssistantStackFinishToPreviousApp" />
   <Entry include="CtsWindowManagerDeviceTestCases android.server.wm.AssistantStackTests#testAssistantStackLaunchNewTask" />
-  <Entry include="CtsWindowManagerDeviceTestCases android.server.wm.WindowInsetsAnimationControllerTests#testControl_andLoseControl[ime]" />
-  <Entry include="CtsWindowManagerDeviceTestCases android.server.wm.WindowInsetsAnimationControllerTests#testControl_immediately_hide[ime]" />
-  <Entry include="CtsWindowManagerDeviceTestCases android.server.wm.WindowInsetsAnimationControllerTests#testControl_transition_hide_interpolator[ime]" />
-  <Entry include="CtsWindowManagerDeviceTestCases android.server.wm.WindowInsetsAnimationControllerTests#testControl_transition_hide[ime]" />
 </SubPlan>