diff --git a/server/site_tests/cheets_CTS_P/control.9.0_dev.arm.waivers b/server/site_tests/cheets_CTS_P/control.9.0_dev.arm.waivers
index 34831bc..748ec7b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_dev.arm.waivers
+++ b/server/site_tests/cheets_CTS_P/control.9.0_dev.arm.waivers
@@ -29,7 +29,7 @@
         target_plan='waivers',
         load_waivers=False,
         bundle='arm',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-6667424-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-6727733-linux_x86-arm.zip',
         timeout=7200)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_dev.x86.waivers b/server/site_tests/cheets_CTS_P/control.9.0_dev.x86.waivers
index f5f055b..ff078c6 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_dev.x86.waivers
+++ b/server/site_tests/cheets_CTS_P/control.9.0_dev.x86.waivers
@@ -29,7 +29,7 @@
         target_plan='waivers',
         load_waivers=False,
         bundle='x86',
-        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-6667424-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-6727733-linux_x86-x86.zip',
         timeout=14400)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.arm.waivers b/server/site_tests/cheets_CTS_P/control.arm.waivers
index 6ca2be7..79e5f8c 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.waivers
+++ b/server/site_tests/cheets_CTS_P/control.arm.waivers
@@ -30,7 +30,7 @@
         bundle='arm',
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        uri='gs://chromeos-partner-gts/android-cts-6667424-linux_x86-arm.zip',
+        uri='gs://chromeos-partner-gts/android-cts-6727733-linux_x86-arm.zip',
         timeout=7200)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.arm.waivers-collect-tests-only b/server/site_tests/cheets_CTS_P/control.arm.waivers-collect-tests-only
index 9a441b4..f6b8863 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.waivers-collect-tests-only
+++ b/server/site_tests/cheets_CTS_P/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/android-cts-6667424-linux_x86-arm.zip',
+        uri='gs://chromeos-partner-gts/android-cts-6727733-linux_x86-arm.zip',
         timeout=360)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.x86.waivers b/server/site_tests/cheets_CTS_P/control.x86.waivers
index 9a1c625..2acfb4f 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.waivers
+++ b/server/site_tests/cheets_CTS_P/control.x86.waivers
@@ -30,7 +30,7 @@
         bundle='x86',
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        uri='gs://chromeos-partner-gts/android-cts-6667424-linux_x86-x86.zip',
+        uri='gs://chromeos-partner-gts/android-cts-6727733-linux_x86-x86.zip',
         timeout=7200)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.x86.waivers-collect-tests-only b/server/site_tests/cheets_CTS_P/control.x86.waivers-collect-tests-only
index 7e6f78a..6672edf 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.waivers-collect-tests-only
+++ b/server/site_tests/cheets_CTS_P/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/android-cts-6667424-linux_x86-x86.zip',
+        uri='gs://chromeos-partner-gts/android-cts-6727733-linux_x86-x86.zip',
         timeout=360)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/subplans/waivers.xml b/server/site_tests/cheets_CTS_P/subplans/waivers.xml
index 2eedf6a..2fac3a4 100644
--- a/server/site_tests/cheets_CTS_P/subplans/waivers.xml
+++ b/server/site_tests/cheets_CTS_P/subplans/waivers.xml
@@ -12,4 +12,5 @@
   <Entry include="CtsKeystoreTestCases android.keystore.cts.CipherTest#testEmptyPlaintextEncryptsAndDecryptsWhenUnlockedRequired" />
   <Entry include="CtsPermission2TestCases android.permission2.cts.PermissionPolicyTest#testPlatformPermissionPolicyUnaltered" />
   <Entry include="CtsIncidentHostTestCases com.android.server.cts.GraphicsStatsValidationTest#testBasicDrawFrame" />
+  <Entry include="CtsSkQPTestCases" />
 </SubPlan>