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 202f297..6330d24 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-6244714-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-6369187-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 fdfd29d..9e2499e 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-6244714-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-6369187-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 cd087b8..dea1f24 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-6244714-linux_x86-arm.zip',
+        uri='gs://chromeos-partner-gts/android-cts-6369187-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 2fe001b..078c641 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-6244714-linux_x86-arm.zip',
+        uri='gs://chromeos-partner-gts/android-cts-6369187-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 0f14eaf..c1c9169 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-6244714-linux_x86-x86.zip',
+        uri='gs://chromeos-partner-gts/android-cts-6369187-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 8fb0cd0..81589dc 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-6244714-linux_x86-x86.zip',
+        uri='gs://chromeos-partner-gts/android-cts-6369187-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 f7e9fb3..c68462f 100644
--- a/server/site_tests/cheets_CTS_P/subplans/waivers.xml
+++ b/server/site_tests/cheets_CTS_P/subplans/waivers.xml
@@ -14,6 +14,7 @@
   <Entry include="CtsLibcoreTestCases com.android.org.conscrypt.javax.net.ssl.SSLContextTest#test_SSLContext_x509AndPskConfiguration_defaultProviderOnly"/>
   <Entry include="CtsLibcoreTestCases com.android.org.conscrypt.javax.net.ssl.SSLSocketTest#test_SSLSocket_ClientHello_cipherSuites"/>
   <Entry include="CtsLibcoreTestCases org.apache.harmony.tests.javax.net.ssl.SSLSessionTest#test_getCipherSuite"/>
+  <Entry include="CtsBatterySavingTestCases android.os.cts.batterysaving.BatterySaverAlarmTest#testAllowWhileIdleThrottled"/>
   <Entry include="CtsViewTestCases android.view.cts.PixelCopyTest#testDialogProducer" />
   <Entry include="CtsViewTestCases android.view.cts.PixelCopyTest#testDialogProducerCopyToRGBA16F" />
   <Entry include="CtsViewTestCases android.view.cts.PixelCopyTest#testWindowProducer" />