Move uploading maven artifacts to the inner loop

Unclear why they were ourside of the inner loop to start with,
seems like some of the variables like `out_dir` were not valid.

Change-Id: Idd861646b7095893ff707655df6794cb83a8e05f
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/14500
Reviewed-by: Godofredo Contreras <godofredoc@google.com>
Commit-Queue: Kaushik Iska <kaushikiska@google.com>
diff --git a/recipes/engine.expected/Linux Fuchsia failing test.json b/recipes/engine.expected/Linux Fuchsia failing test.json
index 180d0f9..ddcd9c7 100644
--- a/recipes/engine.expected/Linux Fuchsia failing test.json
+++ b/recipes/engine.expected/Linux Fuchsia failing test.json
@@ -9994,6 +9994,114 @@
   {
     "cmd": [
       "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile_arm64/flutter_embedding_profile.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_profile-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_profile-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789.jar\"",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_profile-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile_arm64/flutter_embedding_profile.pom",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_profile-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789.pom"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_profile-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789.pom\"",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_profile-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789.pom@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile_arm64/flutter_embedding_profile-sources.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_profile-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789-sources.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_profile-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789-sources.jar\"",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_profile-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789-sources.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
       "[CACHE]/builder/src/flutter/tools/gn",
       "--goma",
       "--android",
@@ -11135,6 +11243,114 @@
   {
     "cmd": [
       "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_release_arm64/flutter_embedding_release.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_release-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_release-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789.jar\"",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_release-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_release_arm64/flutter_embedding_release.pom",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_release-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789.pom"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_release-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789.pom\"",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_release-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789.pom@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_release_arm64/flutter_embedding_release-sources.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_release-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789-sources.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_release-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789-sources.jar\"",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_release-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789-sources.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
       "[CACHE]/builder/src/flutter/tools/gn",
       "--goma",
       "--android",
@@ -12177,6 +12393,114 @@
   {
     "cmd": [
       "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile/flutter_embedding_profile.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_profile-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_profile-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789.jar\" (2)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_profile-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile/flutter_embedding_profile.pom",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_profile-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789.pom"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_profile-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789.pom\" (2)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_profile-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789.pom@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile/flutter_embedding_profile-sources.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_profile-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789-sources.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_profile-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789-sources.jar\" (2)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_profile-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789-sources.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
       "[CACHE]/builder/src/flutter/tools/gn",
       "--goma",
       "--android",
@@ -13318,6 +13642,114 @@
   {
     "cmd": [
       "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_release/flutter_embedding_release.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_release-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_release-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789.jar\" (2)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_release-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_release/flutter_embedding_release.pom",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_release-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789.pom"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_release-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789.pom\" (2)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_release-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789.pom@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_release/flutter_embedding_release-sources.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_release-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789-sources.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_release-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789-sources.jar\" (2)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_release-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789-sources.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
       "[CACHE]/builder/src/flutter/tools/gn",
       "--goma",
       "--android",
@@ -14360,6 +14792,114 @@
   {
     "cmd": [
       "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile_x64/flutter_embedding_profile.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_profile-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_profile-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789.jar\" (3)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_profile-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile_x64/flutter_embedding_profile.pom",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_profile-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789.pom"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_profile-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789.pom\" (3)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_profile-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789.pom@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile_x64/flutter_embedding_profile-sources.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_profile-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789-sources.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_profile-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789-sources.jar\" (3)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_profile-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789-sources.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
       "[CACHE]/builder/src/flutter/tools/gn",
       "--goma",
       "--android",
@@ -15408,114 +15948,6 @@
       "RECIPE_REPO[depot_tools]/gsutil.py",
       "----",
       "cp",
-      "[CACHE]/builder/src/out/android_profile_x64/flutter_embedding_profile.jar",
-      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_profile-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789.jar"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_profile-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789.jar\"",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_profile-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789.jar@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "[CACHE]/builder/src/out/android_profile_x64/flutter_embedding_profile.pom",
-      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_profile-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789.pom"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_profile-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789.pom\"",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_profile-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789.pom@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "[CACHE]/builder/src/out/android_profile_x64/flutter_embedding_profile-sources.jar",
-      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_profile-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789-sources.jar"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_profile-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789-sources.jar\"",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_profile-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789-sources.jar@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
       "[CACHE]/builder/src/out/android_release_x64/flutter_embedding_release.jar",
       "gs://download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_release-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789.jar"
     ],
@@ -15538,7 +15970,7 @@
       ]
     },
     "infra_step": true,
-    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_release-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789.jar\"",
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_release-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789.jar\" (3)",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_release-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789.jar@@@"
     ]
@@ -15574,7 +16006,7 @@
       ]
     },
     "infra_step": true,
-    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_release-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789.pom\"",
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_release-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789.pom\" (3)",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_release-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789.pom@@@"
     ]
@@ -15610,7 +16042,7 @@
       ]
     },
     "infra_step": true,
-    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_release-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789-sources.jar\"",
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_release-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789-sources.jar\" (3)",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789/flutter_embedding_release-1.0.0-2d72510e447ab60a9728aeea2362d8be2cbd7789-sources.jar@@@"
     ]
diff --git a/recipes/engine.expected/experimental_upload.json b/recipes/engine.expected/experimental_upload.json
index 2a8258a..5e44542 100644
--- a/recipes/engine.expected/experimental_upload.json
+++ b/recipes/engine.expected/experimental_upload.json
@@ -9994,6 +9994,114 @@
   {
     "cmd": [
       "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile_arm64/flutter_embedding_profile.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-experimental-/flutter_embedding_profile-1.0.0-experimental-.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-experimental-/flutter_embedding_profile-1.0.0-experimental-.jar\"",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-experimental-/flutter_embedding_profile-1.0.0-experimental-.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile_arm64/flutter_embedding_profile.pom",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-experimental-/flutter_embedding_profile-1.0.0-experimental-.pom"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-experimental-/flutter_embedding_profile-1.0.0-experimental-.pom\"",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-experimental-/flutter_embedding_profile-1.0.0-experimental-.pom@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile_arm64/flutter_embedding_profile-sources.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-experimental-/flutter_embedding_profile-1.0.0-experimental--sources.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-experimental-/flutter_embedding_profile-1.0.0-experimental--sources.jar\"",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-experimental-/flutter_embedding_profile-1.0.0-experimental--sources.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
       "[CACHE]/builder/src/flutter/tools/gn",
       "--goma",
       "--android",
@@ -11135,6 +11243,114 @@
   {
     "cmd": [
       "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_release_arm64/flutter_embedding_release.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-experimental-/flutter_embedding_release-1.0.0-experimental-.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-experimental-/flutter_embedding_release-1.0.0-experimental-.jar\"",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-experimental-/flutter_embedding_release-1.0.0-experimental-.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_release_arm64/flutter_embedding_release.pom",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-experimental-/flutter_embedding_release-1.0.0-experimental-.pom"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-experimental-/flutter_embedding_release-1.0.0-experimental-.pom\"",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-experimental-/flutter_embedding_release-1.0.0-experimental-.pom@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_release_arm64/flutter_embedding_release-sources.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-experimental-/flutter_embedding_release-1.0.0-experimental--sources.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-experimental-/flutter_embedding_release-1.0.0-experimental--sources.jar\"",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-experimental-/flutter_embedding_release-1.0.0-experimental--sources.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
       "[CACHE]/builder/src/flutter/tools/gn",
       "--goma",
       "--android",
@@ -12177,6 +12393,114 @@
   {
     "cmd": [
       "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile/flutter_embedding_profile.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-experimental-/flutter_embedding_profile-1.0.0-experimental-.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-experimental-/flutter_embedding_profile-1.0.0-experimental-.jar\" (2)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-experimental-/flutter_embedding_profile-1.0.0-experimental-.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile/flutter_embedding_profile.pom",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-experimental-/flutter_embedding_profile-1.0.0-experimental-.pom"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-experimental-/flutter_embedding_profile-1.0.0-experimental-.pom\" (2)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-experimental-/flutter_embedding_profile-1.0.0-experimental-.pom@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile/flutter_embedding_profile-sources.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-experimental-/flutter_embedding_profile-1.0.0-experimental--sources.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-experimental-/flutter_embedding_profile-1.0.0-experimental--sources.jar\" (2)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-experimental-/flutter_embedding_profile-1.0.0-experimental--sources.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
       "[CACHE]/builder/src/flutter/tools/gn",
       "--goma",
       "--android",
@@ -13318,6 +13642,114 @@
   {
     "cmd": [
       "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_release/flutter_embedding_release.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-experimental-/flutter_embedding_release-1.0.0-experimental-.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-experimental-/flutter_embedding_release-1.0.0-experimental-.jar\" (2)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-experimental-/flutter_embedding_release-1.0.0-experimental-.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_release/flutter_embedding_release.pom",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-experimental-/flutter_embedding_release-1.0.0-experimental-.pom"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-experimental-/flutter_embedding_release-1.0.0-experimental-.pom\" (2)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-experimental-/flutter_embedding_release-1.0.0-experimental-.pom@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_release/flutter_embedding_release-sources.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-experimental-/flutter_embedding_release-1.0.0-experimental--sources.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-experimental-/flutter_embedding_release-1.0.0-experimental--sources.jar\" (2)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-experimental-/flutter_embedding_release-1.0.0-experimental--sources.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
       "[CACHE]/builder/src/flutter/tools/gn",
       "--goma",
       "--android",
@@ -14360,6 +14792,114 @@
   {
     "cmd": [
       "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile_x64/flutter_embedding_profile.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-experimental-/flutter_embedding_profile-1.0.0-experimental-.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-experimental-/flutter_embedding_profile-1.0.0-experimental-.jar\" (3)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-experimental-/flutter_embedding_profile-1.0.0-experimental-.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile_x64/flutter_embedding_profile.pom",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-experimental-/flutter_embedding_profile-1.0.0-experimental-.pom"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-experimental-/flutter_embedding_profile-1.0.0-experimental-.pom\" (3)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-experimental-/flutter_embedding_profile-1.0.0-experimental-.pom@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile_x64/flutter_embedding_profile-sources.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-experimental-/flutter_embedding_profile-1.0.0-experimental--sources.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-experimental-/flutter_embedding_profile-1.0.0-experimental--sources.jar\" (3)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-experimental-/flutter_embedding_profile-1.0.0-experimental--sources.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
       "[CACHE]/builder/src/flutter/tools/gn",
       "--goma",
       "--android",
@@ -15408,114 +15948,6 @@
       "RECIPE_REPO[depot_tools]/gsutil.py",
       "----",
       "cp",
-      "[CACHE]/builder/src/out/android_profile_x64/flutter_embedding_profile.jar",
-      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-experimental-/flutter_embedding_profile-1.0.0-experimental-.jar"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-experimental-/flutter_embedding_profile-1.0.0-experimental-.jar\"",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-experimental-/flutter_embedding_profile-1.0.0-experimental-.jar@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "[CACHE]/builder/src/out/android_profile_x64/flutter_embedding_profile.pom",
-      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-experimental-/flutter_embedding_profile-1.0.0-experimental-.pom"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-experimental-/flutter_embedding_profile-1.0.0-experimental-.pom\"",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-experimental-/flutter_embedding_profile-1.0.0-experimental-.pom@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "[CACHE]/builder/src/out/android_profile_x64/flutter_embedding_profile-sources.jar",
-      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-experimental-/flutter_embedding_profile-1.0.0-experimental--sources.jar"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-experimental-/flutter_embedding_profile-1.0.0-experimental--sources.jar\"",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-experimental-/flutter_embedding_profile-1.0.0-experimental--sources.jar@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
       "[CACHE]/builder/src/out/android_release_x64/flutter_embedding_release.jar",
       "gs://download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-experimental-/flutter_embedding_release-1.0.0-experimental-.jar"
     ],
@@ -15538,7 +15970,7 @@
       ]
     },
     "infra_step": true,
-    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-experimental-/flutter_embedding_release-1.0.0-experimental-.jar\"",
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-experimental-/flutter_embedding_release-1.0.0-experimental-.jar\" (3)",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-experimental-/flutter_embedding_release-1.0.0-experimental-.jar@@@"
     ]
@@ -15574,7 +16006,7 @@
       ]
     },
     "infra_step": true,
-    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-experimental-/flutter_embedding_release-1.0.0-experimental-.pom\"",
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-experimental-/flutter_embedding_release-1.0.0-experimental-.pom\" (3)",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-experimental-/flutter_embedding_release-1.0.0-experimental-.pom@@@"
     ]
@@ -15610,7 +16042,7 @@
       ]
     },
     "infra_step": true,
-    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-experimental-/flutter_embedding_release-1.0.0-experimental--sources.jar\"",
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-experimental-/flutter_embedding_release-1.0.0-experimental--sources.jar\" (3)",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-experimental-/flutter_embedding_release-1.0.0-experimental--sources.jar@@@"
     ]
diff --git a/recipes/engine.expected/linux_upload.json b/recipes/engine.expected/linux_upload.json
index 3a9015e..d60b599 100644
--- a/recipes/engine.expected/linux_upload.json
+++ b/recipes/engine.expected/linux_upload.json
@@ -9994,6 +9994,114 @@
   {
     "cmd": [
       "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile_arm64/flutter_embedding_profile.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.jar\"",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile_arm64/flutter_embedding_profile.pom",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.pom"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.pom\"",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.pom@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile_arm64/flutter_embedding_profile-sources.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234-sources.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234-sources.jar\"",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234-sources.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
       "[CACHE]/builder/src/flutter/tools/gn",
       "--goma",
       "--android",
@@ -11135,6 +11243,114 @@
   {
     "cmd": [
       "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_release_arm64/flutter_embedding_release.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.jar\"",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_release_arm64/flutter_embedding_release.pom",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.pom"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.pom\"",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.pom@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_release_arm64/flutter_embedding_release-sources.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234-sources.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234-sources.jar\"",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234-sources.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
       "[CACHE]/builder/src/flutter/tools/gn",
       "--goma",
       "--android",
@@ -12177,6 +12393,114 @@
   {
     "cmd": [
       "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile/flutter_embedding_profile.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.jar\" (2)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile/flutter_embedding_profile.pom",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.pom"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.pom\" (2)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.pom@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile/flutter_embedding_profile-sources.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234-sources.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234-sources.jar\" (2)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234-sources.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
       "[CACHE]/builder/src/flutter/tools/gn",
       "--goma",
       "--android",
@@ -13318,6 +13642,114 @@
   {
     "cmd": [
       "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_release/flutter_embedding_release.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.jar\" (2)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_release/flutter_embedding_release.pom",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.pom"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.pom\" (2)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.pom@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_release/flutter_embedding_release-sources.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234-sources.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234-sources.jar\" (2)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234-sources.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
       "[CACHE]/builder/src/flutter/tools/gn",
       "--goma",
       "--android",
@@ -14360,6 +14792,114 @@
   {
     "cmd": [
       "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile_x64/flutter_embedding_profile.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.jar\" (3)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile_x64/flutter_embedding_profile.pom",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.pom"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.pom\" (3)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.pom@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile_x64/flutter_embedding_profile-sources.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234-sources.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234-sources.jar\" (3)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234-sources.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
       "[CACHE]/builder/src/flutter/tools/gn",
       "--goma",
       "--android",
@@ -15408,114 +15948,6 @@
       "RECIPE_REPO[depot_tools]/gsutil.py",
       "----",
       "cp",
-      "[CACHE]/builder/src/out/android_profile_x64/flutter_embedding_profile.jar",
-      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.jar"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.jar\"",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.jar@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "[CACHE]/builder/src/out/android_profile_x64/flutter_embedding_profile.pom",
-      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.pom"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.pom\"",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.pom@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "[CACHE]/builder/src/out/android_profile_x64/flutter_embedding_profile-sources.jar",
-      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234-sources.jar"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234-sources.jar\"",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234-sources.jar@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
       "[CACHE]/builder/src/out/android_release_x64/flutter_embedding_release.jar",
       "gs://download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.jar"
     ],
@@ -15538,7 +15970,7 @@
       ]
     },
     "infra_step": true,
-    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.jar\"",
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.jar\" (3)",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.jar@@@"
     ]
@@ -15574,7 +16006,7 @@
       ]
     },
     "infra_step": true,
-    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.pom\"",
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.pom\" (3)",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.pom@@@"
     ]
@@ -15610,7 +16042,7 @@
       ]
     },
     "infra_step": true,
-    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234-sources.jar\"",
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234-sources.jar\" (3)",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234-sources.jar@@@"
     ]
diff --git a/recipes/engine.expected/linux_upload_no_lto.json b/recipes/engine.expected/linux_upload_no_lto.json
index a623a9a..0af4d96 100644
--- a/recipes/engine.expected/linux_upload_no_lto.json
+++ b/recipes/engine.expected/linux_upload_no_lto.json
@@ -10002,6 +10002,114 @@
   {
     "cmd": [
       "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile_arm64/flutter_embedding_profile.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.jar\"",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile_arm64/flutter_embedding_profile.pom",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.pom"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.pom\"",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.pom@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile_arm64/flutter_embedding_profile-sources.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234-sources.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234-sources.jar\"",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234-sources.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
       "[CACHE]/builder/src/flutter/tools/gn",
       "--goma",
       "--android",
@@ -11144,6 +11252,114 @@
   {
     "cmd": [
       "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_release_arm64/flutter_embedding_release.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.jar\"",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_release_arm64/flutter_embedding_release.pom",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.pom"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.pom\"",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.pom@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_release_arm64/flutter_embedding_release-sources.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234-sources.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234-sources.jar\"",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234-sources.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
       "[CACHE]/builder/src/flutter/tools/gn",
       "--goma",
       "--android",
@@ -12187,6 +12403,114 @@
   {
     "cmd": [
       "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile/flutter_embedding_profile.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.jar\" (2)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile/flutter_embedding_profile.pom",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.pom"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.pom\" (2)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.pom@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile/flutter_embedding_profile-sources.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234-sources.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234-sources.jar\" (2)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234-sources.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
       "[CACHE]/builder/src/flutter/tools/gn",
       "--goma",
       "--android",
@@ -13329,6 +13653,114 @@
   {
     "cmd": [
       "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_release/flutter_embedding_release.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.jar\" (2)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_release/flutter_embedding_release.pom",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.pom"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.pom\" (2)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.pom@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_release/flutter_embedding_release-sources.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234-sources.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234-sources.jar\" (2)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234-sources.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
       "[CACHE]/builder/src/flutter/tools/gn",
       "--goma",
       "--android",
@@ -14372,6 +14804,114 @@
   {
     "cmd": [
       "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile_x64/flutter_embedding_profile.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.jar\" (3)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile_x64/flutter_embedding_profile.pom",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.pom"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.pom\" (3)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.pom@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile_x64/flutter_embedding_profile-sources.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234-sources.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234-sources.jar\" (3)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234-sources.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
       "[CACHE]/builder/src/flutter/tools/gn",
       "--goma",
       "--android",
@@ -15421,114 +15961,6 @@
       "RECIPE_REPO[depot_tools]/gsutil.py",
       "----",
       "cp",
-      "[CACHE]/builder/src/out/android_profile_x64/flutter_embedding_profile.jar",
-      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.jar"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.jar\"",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.jar@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "[CACHE]/builder/src/out/android_profile_x64/flutter_embedding_profile.pom",
-      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.pom"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.pom\"",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.pom@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "[CACHE]/builder/src/out/android_profile_x64/flutter_embedding_profile-sources.jar",
-      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234-sources.jar"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234-sources.jar\"",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234-sources.jar@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
       "[CACHE]/builder/src/out/android_release_x64/flutter_embedding_release.jar",
       "gs://download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.jar"
     ],
@@ -15551,7 +15983,7 @@
       ]
     },
     "infra_step": true,
-    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.jar\"",
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.jar\" (3)",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.jar@@@"
     ]
@@ -15587,7 +16019,7 @@
       ]
     },
     "infra_step": true,
-    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.pom\"",
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.pom\" (3)",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.pom@@@"
     ]
@@ -15623,7 +16055,7 @@
       ]
     },
     "infra_step": true,
-    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234-sources.jar\"",
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234-sources.jar\" (3)",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234-sources.jar@@@"
     ]
diff --git a/recipes/engine.expected/linux_upload_publish_cipd.json b/recipes/engine.expected/linux_upload_publish_cipd.json
index 1d462c1..1768b27 100644
--- a/recipes/engine.expected/linux_upload_publish_cipd.json
+++ b/recipes/engine.expected/linux_upload_publish_cipd.json
@@ -9994,6 +9994,114 @@
   {
     "cmd": [
       "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile_arm64/flutter_embedding_profile.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.jar\"",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile_arm64/flutter_embedding_profile.pom",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.pom"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.pom\"",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.pom@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile_arm64/flutter_embedding_profile-sources.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234-sources.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234-sources.jar\"",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234-sources.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
       "[CACHE]/builder/src/flutter/tools/gn",
       "--goma",
       "--android",
@@ -11135,6 +11243,114 @@
   {
     "cmd": [
       "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_release_arm64/flutter_embedding_release.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.jar\"",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_release_arm64/flutter_embedding_release.pom",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.pom"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.pom\"",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.pom@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_release_arm64/flutter_embedding_release-sources.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234-sources.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234-sources.jar\"",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234-sources.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
       "[CACHE]/builder/src/flutter/tools/gn",
       "--goma",
       "--android",
@@ -12177,6 +12393,114 @@
   {
     "cmd": [
       "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile/flutter_embedding_profile.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.jar\" (2)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile/flutter_embedding_profile.pom",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.pom"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.pom\" (2)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.pom@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile/flutter_embedding_profile-sources.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234-sources.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234-sources.jar\" (2)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234-sources.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
       "[CACHE]/builder/src/flutter/tools/gn",
       "--goma",
       "--android",
@@ -13318,6 +13642,114 @@
   {
     "cmd": [
       "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_release/flutter_embedding_release.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.jar\" (2)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_release/flutter_embedding_release.pom",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.pom"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.pom\" (2)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.pom@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_release/flutter_embedding_release-sources.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234-sources.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234-sources.jar\" (2)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234-sources.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
       "[CACHE]/builder/src/flutter/tools/gn",
       "--goma",
       "--android",
@@ -14360,6 +14792,114 @@
   {
     "cmd": [
       "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile_x64/flutter_embedding_profile.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.jar\" (3)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile_x64/flutter_embedding_profile.pom",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.pom"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.pom\" (3)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.pom@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile_x64/flutter_embedding_profile-sources.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234-sources.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234-sources.jar\" (3)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234-sources.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
       "[CACHE]/builder/src/flutter/tools/gn",
       "--goma",
       "--android",
@@ -15408,114 +15948,6 @@
       "RECIPE_REPO[depot_tools]/gsutil.py",
       "----",
       "cp",
-      "[CACHE]/builder/src/out/android_profile_x64/flutter_embedding_profile.jar",
-      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.jar"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.jar\"",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.jar@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "[CACHE]/builder/src/out/android_profile_x64/flutter_embedding_profile.pom",
-      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.pom"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.pom\"",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.pom@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "[CACHE]/builder/src/out/android_profile_x64/flutter_embedding_profile-sources.jar",
-      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234-sources.jar"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234-sources.jar\"",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234-sources.jar@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
       "[CACHE]/builder/src/out/android_release_x64/flutter_embedding_release.jar",
       "gs://download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.jar"
     ],
@@ -15538,7 +15970,7 @@
       ]
     },
     "infra_step": true,
-    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.jar\"",
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.jar\" (3)",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.jar@@@"
     ]
@@ -15574,7 +16006,7 @@
       ]
     },
     "infra_step": true,
-    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.pom\"",
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.pom\" (3)",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.pom@@@"
     ]
@@ -15610,7 +16042,7 @@
       ]
     },
     "infra_step": true,
-    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234-sources.jar\"",
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234-sources.jar\" (3)",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234-sources.jar@@@"
     ]
diff --git a/recipes/engine.expected/linux_upload_publish_cipd_no_lto.json b/recipes/engine.expected/linux_upload_publish_cipd_no_lto.json
index c073000..32b26cd 100644
--- a/recipes/engine.expected/linux_upload_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/linux_upload_publish_cipd_no_lto.json
@@ -10002,6 +10002,114 @@
   {
     "cmd": [
       "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile_arm64/flutter_embedding_profile.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.jar\"",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile_arm64/flutter_embedding_profile.pom",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.pom"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.pom\"",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.pom@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile_arm64/flutter_embedding_profile-sources.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234-sources.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234-sources.jar\"",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234-sources.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
       "[CACHE]/builder/src/flutter/tools/gn",
       "--goma",
       "--android",
@@ -11144,6 +11252,114 @@
   {
     "cmd": [
       "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_release_arm64/flutter_embedding_release.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.jar\"",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_release_arm64/flutter_embedding_release.pom",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.pom"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.pom\"",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.pom@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_release_arm64/flutter_embedding_release-sources.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234-sources.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234-sources.jar\"",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234-sources.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
       "[CACHE]/builder/src/flutter/tools/gn",
       "--goma",
       "--android",
@@ -12187,6 +12403,114 @@
   {
     "cmd": [
       "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile/flutter_embedding_profile.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.jar\" (2)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile/flutter_embedding_profile.pom",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.pom"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.pom\" (2)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.pom@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile/flutter_embedding_profile-sources.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234-sources.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234-sources.jar\" (2)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234-sources.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
       "[CACHE]/builder/src/flutter/tools/gn",
       "--goma",
       "--android",
@@ -13329,6 +13653,114 @@
   {
     "cmd": [
       "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_release/flutter_embedding_release.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.jar\" (2)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_release/flutter_embedding_release.pom",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.pom"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.pom\" (2)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.pom@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_release/flutter_embedding_release-sources.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234-sources.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234-sources.jar\" (2)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234-sources.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
       "[CACHE]/builder/src/flutter/tools/gn",
       "--goma",
       "--android",
@@ -14372,6 +14804,114 @@
   {
     "cmd": [
       "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile_x64/flutter_embedding_profile.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.jar\" (3)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile_x64/flutter_embedding_profile.pom",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.pom"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.pom\" (3)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.pom@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+      "--",
+      "RECIPE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[CACHE]/builder/src/out/android_profile_x64/flutter_embedding_profile-sources.jar",
+      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234-sources.jar"
+    ],
+    "cwd": "[CACHE]/builder",
+    "env": {
+      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+      "GOMA_DIR": "[CACHE]/goma/client"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+      ]
+    },
+    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
+      "PATH": [
+        "RECIPE_REPO[depot_tools]"
+      ]
+    },
+    "infra_step": true,
+    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234-sources.jar\" (3)",
+    "~followup_annotations": [
+      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234-sources.jar@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
       "[CACHE]/builder/src/flutter/tools/gn",
       "--goma",
       "--android",
@@ -15421,114 +15961,6 @@
       "RECIPE_REPO[depot_tools]/gsutil.py",
       "----",
       "cp",
-      "[CACHE]/builder/src/out/android_profile_x64/flutter_embedding_profile.jar",
-      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.jar"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.jar\"",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.jar@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "[CACHE]/builder/src/out/android_profile_x64/flutter_embedding_profile.pom",
-      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.pom"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.pom\"",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234.pom@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "[CACHE]/builder/src/out/android_profile_x64/flutter_embedding_profile-sources.jar",
-      "gs://download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234-sources.jar"
-    ],
-    "cwd": "[CACHE]/builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "gsutil upload \"io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234-sources.jar\"",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_profile/1.0.0-abcd1234/flutter_embedding_profile-1.0.0-abcd1234-sources.jar@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
       "[CACHE]/builder/src/out/android_release_x64/flutter_embedding_release.jar",
       "gs://download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.jar"
     ],
@@ -15551,7 +15983,7 @@
       ]
     },
     "infra_step": true,
-    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.jar\"",
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.jar\" (3)",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.jar@@@"
     ]
@@ -15587,7 +16019,7 @@
       ]
     },
     "infra_step": true,
-    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.pom\"",
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.pom\" (3)",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234.pom@@@"
     ]
@@ -15623,7 +16055,7 @@
       ]
     },
     "infra_step": true,
-    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234-sources.jar\"",
+    "name": "gsutil upload \"io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234-sources.jar\" (3)",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-abcd1234/flutter_embedding_release-1.0.0-abcd1234-sources.jar@@@"
     ]
diff --git a/recipes/engine.py b/recipes/engine.py
index 3e407a4..368957d 100644
--- a/recipes/engine.py
+++ b/recipes/engine.py
@@ -593,19 +593,17 @@
               api, upload_dir, unstripped_lib_flutter_path, android_triple
           )
 
-    # Upload the embedding
-    for runtime_mode in ['profile', 'release']:
-      build_output_dir = out_dir % runtime_mode
-      UploadMavenArtifacts(
-          api, [
-              'out/%s/flutter_embedding_%s.jar' %
-              (build_output_dir, runtime_mode),
-              'out/%s/flutter_embedding_%s.pom' %
-              (build_output_dir, runtime_mode),
-              'out/%s/flutter_embedding_%s-sources.jar' %
-              (build_output_dir, runtime_mode),
-          ], swarming_task_id
-      )
+        # Upload the embedding
+        UploadMavenArtifacts(
+            api, [
+                'out/%s/flutter_embedding_%s.jar' %
+                (build_output_dir, runtime_mode),
+                'out/%s/flutter_embedding_%s.pom' %
+                (build_output_dir, runtime_mode),
+                'out/%s/flutter_embedding_%s-sources.jar' %
+                (build_output_dir, runtime_mode),
+            ], swarming_task_id
+        )
 
 
 def PackageLinuxDesktopVariant(api, label, bucket_name):