diff --git a/.github/actions/aws-device-farm-run/action.yml b/.github/actions/aws-device-farm-run/action.yml
index 42aae41ac..bd62cf98c 100644
--- a/.github/actions/aws-device-farm-run/action.yml
+++ b/.github/actions/aws-device-farm-run/action.yml
@@ -46,6 +46,7 @@ inputs:
 outputs:
   runArn:
     description: ARN of run
+    value: ${{ steps.schedule_run.outputs.runArn }}
 runs:
   using: "composite"
   steps:
diff --git a/.github/workflows/android-device-test.yml b/.github/workflows/android-device-test.yml
index ee3bf3020..f8da7bab2 100644
--- a/.github/workflows/android-device-test.yml
+++ b/.github/workflows/android-device-test.yml
@@ -9,6 +9,7 @@ on:
 jobs:
   android-device-test:
     strategy:
+      fail-fast: false
       max-parallel: 2
       matrix:
         test: [
@@ -129,6 +130,7 @@ jobs:
           testSpecArn: ${{ matrix.test.testSpecArn }}
 
       - name: Upload benchmark results to S3
+        if: env.run_device_test == 'true' && matrix.test.name == 'Android Benchmark'
         run: |
           npm install --ignore-scripts
           node scripts/aws-device-farm/download-benchmark-results.mjs ${{ steps.aws_device_farm_run.outputs.runArn }}