diff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yaml
index f65795fe8..ee2b19a0b 100644
--- a/.github/workflows/Build.yaml
+++ b/.github/workflows/Build.yaml
@@ -250,9 +250,9 @@ jobs:
           - api-level: 27
             profile: pixel_5
             target: default
-          - api-level: 33
-            profile: pixel_fold
-            target: google_apis
+#          - api-level: 33
+#            profile: pixel_fold
+#            target: google_apis
           - api-level: 35
             profile: pixel_fold
             target: google_apis
@@ -350,7 +350,7 @@ jobs:
           arch: x86_64
           disable-animations: true
           disk-size: 6000M
-          emulator-build: 11834374 # 34.2.14
+          emulator-build: 12895296 # 35.4.5 - https://developer.android.com/studio/emulator_archive
           heap-size: 600M
           profile: ${{ matrix.profile }}
           emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
diff --git a/app/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/ui/EdgeToEdgeTest.kt b/app/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/ui/EdgeToEdgeTest.kt
index c434106a9..6e40445be 100644
--- a/app/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/ui/EdgeToEdgeTest.kt
+++ b/app/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/ui/EdgeToEdgeTest.kt
@@ -92,9 +92,8 @@ class EdgeToEdgeTest {
     @Before
     fun enableDemoMode() {
         UiDevice.getInstance(InstrumentationRegistry.getInstrumentation()).apply {
-
             executeShellCommand(
-                "settings put global development_settings_enabled 1"
+                "settings put global development_settings_enabled 1",
             )
             executeShellCommand("settings put global sysui_demo_allowed 1")
             executeShellCommand(
@@ -128,16 +127,16 @@ class EdgeToEdgeTest {
     fun disableDemoMode() {
         exitDemoMode()
         executeShellCommand(
-            "settings put global sysui_demo_allowed 0"
+            "settings put global sysui_demo_allowed 0",
         )
         executeShellCommand(
-            "settings put global development_settings_enabled 0"
+            "settings put global development_settings_enabled 0",
         )
     }
 
     private fun exitDemoMode() {
         executeShellCommand(
-            "am broadcast -a com.android.systemui.demo -e command exit"
+            "am broadcast -a com.android.systemui.demo -e command exit",
         )
     }