diff --git a/.github/workflows/agp-matrix.yml b/.github/workflows/agp-matrix.yml
index a0c60560ea..0fbe89dfca 100644
--- a/.github/workflows/agp-matrix.yml
+++ b/.github/workflows/agp-matrix.yml
@@ -25,7 +25,8 @@ jobs:
       VERSION_AGP: ${{ matrix.agp }}
       APPLY_SENTRY_INTEGRATIONS: ${{ matrix.integrations }}
       # Upload replay snapshots from one cell only. Forks don't have access to the upload secret.
-      UPLOAD_REPLAY_SNAPSHOTS: ${{ matrix.agp == '9.4.0' && matrix.integrations && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) }}
+      # Experiment: don't upload snapshots from this branch
+      UPLOAD_REPLAY_SNAPSHOTS: false
 
     steps:
       - name: Checkout Repo
@@ -53,13 +54,13 @@ jobs:
           path: |
             ~/.android/avd/*
             ~/.android/adb*
-          key: avd-api-35-x86_64-google_apis
+          key: avd-api-30-x86_64-google_apis
 
       - name: Create AVD and generate snapshot for caching
         if: steps.avd-cache.outputs.cache-hit != 'true'
         uses: reactivecircus/android-emulator-runner@a421e43855164a8197daf9d8d40fe71c6996bb0d # pin@v2
         with:
-          api-level: 35
+          api-level: 30
           # Not an ATD image: PixelCopy returns no data on ATDs, which the replay tests need
           target: google_apis
           channel: canary
@@ -79,7 +80,7 @@ jobs:
       - name: Run instrumentation tests
         uses: reactivecircus/android-emulator-runner@a421e43855164a8197daf9d8d40fe71c6996bb0d # pin@v2
         with:
-          api-level: 35
+          api-level: 30
           # Not an ATD image: PixelCopy returns no data on ATDs, which the replay tests need
           target: google_apis
           channel: canary