diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg
index e26310d..6a8f7e6 100644
--- a/infra/config/recipes.cfg
+++ b/infra/config/recipes.cfg
@@ -22,22 +22,22 @@
   "deps": {
     "dart": {
       "branch": "refs/heads/main",
-      "revision": "f92defce7bb330a8752a69396b85128e4961759c",
+      "revision": "062f9e205c0fd3118002dd4fecc195404f9704ee",
       "url": "https://dart.googlesource.com/recipes.git"
     },
     "depot_tools": {
       "branch": "refs/heads/main",
-      "revision": "913bda46ea2d8466ade17fe88aa2d4bee0c1e828",
+      "revision": "680bb6e702516e0c020707d3cd2b06c0b5071fa0",
       "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
     },
     "fuchsia": {
       "branch": "refs/heads/main",
-      "revision": "506a2f9bbf65a40bffc52862e13511ac377324ae",
+      "revision": "f17efdc3b91b5998c3ac16b289dacb38d4bf27e9",
       "url": "https://fuchsia.googlesource.com/infra/recipes.git"
     },
     "recipe_engine": {
       "branch": "refs/heads/main",
-      "revision": "8d9142848974ef5d02de7185f1f7be211ed6b555",
+      "revision": "3628a0dbaeb59554629dff4734e001e635e2e30e",
       "url": "https://chromium.googlesource.com/infra/luci/recipes-py.git"
     }
   },
diff --git a/recipe_modules/flutter_deps/examples/full.expected/mac.json b/recipe_modules/flutter_deps/examples/full.expected/mac.json
index aff68ce..2771c2e 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/mac.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/mac.json
@@ -1,5 +1,12 @@
 [
   {
+    "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "name": "find macOS version"
+  },
+  {
     "cmd": [],
     "name": "OpenJDK dependency"
   },
@@ -934,7 +941,7 @@
   {
     "cmd": [
       "echo",
-      "[CACHE]/osx_sdk/xcode_9f2000"
+      "[CACHE]/osx_sdk/xcode_12a7209"
     ],
     "infra_step": true,
     "name": "show app_dir"
@@ -978,7 +985,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/osx_sdk/xcode_9f2000",
+      "[CACHE]/osx_sdk/xcode_12a7209",
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} latest",
       "-max-threads",
@@ -1005,16 +1012,28 @@
   },
   {
     "cmd": [
-      "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_12a7209"
+    ],
+    "infra_step": true,
+    "name": "install xcode.Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[CACHE]/osx_sdk/xcode_12a7209/mac_toolchain",
       "install",
       "-kind",
       "ios",
       "-xcode-version",
-      "9f2000",
+      "12a7209",
       "-output-dir",
-      "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
+      "[CACHE]/osx_sdk/xcode_12a7209/XCode.app",
       "-cipd-package-prefix",
-      "flutter_internal/ios/xcode",
+      "infra_internal/ios/xcode",
       "-with-runtime=True",
       "-verbose"
     ],
@@ -1040,7 +1059,7 @@
       "sudo",
       "xcode-select",
       "--switch",
-      "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
+      "[CACHE]/osx_sdk/xcode_12a7209/XCode.app"
     ],
     "infra_step": true,
     "name": "select xcode"
@@ -1066,13 +1085,9 @@
   },
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[CACHE]/osx_sdk/xcode_9f2000"
+      "rm",
+      "-rf",
+      "[CACHE]/osx_sdk/xcode_12a7209"
     ],
     "infra_step": true,
     "name": "Cleaning up Xcode cache"
@@ -1080,7 +1095,7 @@
   {
     "cmd": [
       "echo",
-      "[CACHE]/osx_sdk/xcode_9f2000"
+      "[CACHE]/osx_sdk/xcode_12a7209"
     ],
     "infra_step": true,
     "name": "show app_dir (2)"
@@ -1124,7 +1139,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/osx_sdk/xcode_9f2000",
+      "[CACHE]/osx_sdk/xcode_12a7209",
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} latest",
       "-max-threads",
@@ -1151,16 +1166,28 @@
   },
   {
     "cmd": [
-      "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_12a7209"
+    ],
+    "infra_step": true,
+    "name": "install xcode (2).Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[CACHE]/osx_sdk/xcode_12a7209/mac_toolchain",
       "install",
       "-kind",
       "ios",
       "-xcode-version",
-      "9f2000",
+      "12a7209",
       "-output-dir",
-      "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
+      "[CACHE]/osx_sdk/xcode_12a7209/XCode.app",
       "-cipd-package-prefix",
-      "flutter_internal/ios/xcode",
+      "infra_internal/ios/xcode",
       "-with-runtime=True",
       "-verbose"
     ],
@@ -1172,6 +1199,140 @@
     ]
   },
   {
+    "cmd": [],
+    "name": "Cleaning up runtimes cache"
+  },
+  {
+    "cmd": [
+      "sudo",
+      "xcode-select",
+      "--switch",
+      "[CACHE]/osx_sdk/xcode_12a7209/XCode.app"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache.select xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "runtime",
+      "delete",
+      "all"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache.Cleaning up mounted simulator runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "xcodebuild",
+      "-version"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache.check xcode version",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "list",
+      "runtimes"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache.list runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "install runtimes"
+  },
+  {
+    "cmd": [],
+    "name": "install runtimes.install xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[CACHE]/osx_sdk/xcode_12a7209",
+      "-ensure-file",
+      "infra/tools/mac_toolchain/${platform} latest",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "infra_step": true,
+    "name": "install runtimes.install xcode.ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-latest----------\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      }@@@",
+      "@@@STEP_LOG_LINE@json.output@    ]@@@",
+      "@@@STEP_LOG_LINE@json.output@  }@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_12a7209"
+    ],
+    "infra_step": true,
+    "name": "install runtimes.install xcode.Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[CACHE]/osx_sdk/xcode_12a7209/mac_toolchain",
+      "install",
+      "-kind",
+      "ios",
+      "-xcode-version",
+      "12a7209",
+      "-output-dir",
+      "[CACHE]/osx_sdk/xcode_12a7209/XCode.app",
+      "-cipd-package-prefix",
+      "infra_internal/ios/xcode",
+      "-with-runtime=True",
+      "-verbose"
+    ],
+    "infra_step": true,
+    "name": "install runtimes.install xcode.install xcode from cipd",
+    "timeout": 1800,
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "killall",
       "-9",
@@ -1186,7 +1347,7 @@
       "sudo",
       "xcode-select",
       "--switch",
-      "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
+      "[CACHE]/osx_sdk/xcode_12a7209/XCode.app"
     ],
     "infra_step": true,
     "name": "select xcode (2)"
@@ -1208,7 +1369,7 @@
       "--json-output",
       "/path/to/tmp/json",
       "rmtree",
-      "/opt/flutter/xcode/9f2000"
+      "/opt/flutter/xcode/12a7209"
     ],
     "infra_step": true,
     "name": "Cleaning up Xcode cache (2)"
@@ -1249,16 +1410,28 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CLEANUP]/tmp_tmp_6/osx_sdk"
+    ],
+    "infra_step": true,
+    "name": "install xcode (3).Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
       "[CLEANUP]/tmp_tmp_6/osx_sdk/mac_toolchain",
       "install",
       "-kind",
       "ios",
       "-xcode-version",
-      "9f2000",
+      "12a7209",
       "-output-dir",
-      "/opt/flutter/xcode/9f2000/XCode.app",
+      "/opt/flutter/xcode/12a7209/XCode.app",
       "-cipd-package-prefix",
-      "flutter_internal/ios/xcode",
+      "infra_internal/ios/xcode",
       "-with-runtime=True",
       "-verbose"
     ],
@@ -1270,6 +1443,140 @@
     ]
   },
   {
+    "cmd": [],
+    "name": "Cleaning up runtimes cache (2)"
+  },
+  {
+    "cmd": [
+      "sudo",
+      "xcode-select",
+      "--switch",
+      "/opt/flutter/xcode/12a7209/XCode.app"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (2).select xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "runtime",
+      "delete",
+      "all"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (2).Cleaning up mounted simulator runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "xcodebuild",
+      "-version"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (2).check xcode version",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "list",
+      "runtimes"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (2).list runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "install runtimes (2)"
+  },
+  {
+    "cmd": [],
+    "name": "install runtimes (2).install xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[CLEANUP]/tmp_tmp_6/osx_sdk",
+      "-ensure-file",
+      "infra/tools/mac_toolchain/${platform} latest",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "infra_step": true,
+    "name": "install runtimes (2).install xcode.ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-latest----------\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      }@@@",
+      "@@@STEP_LOG_LINE@json.output@    ]@@@",
+      "@@@STEP_LOG_LINE@json.output@  }@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "ls",
+      "-al",
+      "[CLEANUP]/tmp_tmp_6/osx_sdk"
+    ],
+    "infra_step": true,
+    "name": "install runtimes (2).install xcode.Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[CLEANUP]/tmp_tmp_6/osx_sdk/mac_toolchain",
+      "install",
+      "-kind",
+      "ios",
+      "-xcode-version",
+      "12a7209",
+      "-output-dir",
+      "/opt/flutter/xcode/12a7209/XCode.app",
+      "-cipd-package-prefix",
+      "infra_internal/ios/xcode",
+      "-with-runtime=True",
+      "-verbose"
+    ],
+    "infra_step": true,
+    "name": "install runtimes (2).install xcode.install xcode from cipd",
+    "timeout": 1800,
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "killall",
       "-9",
@@ -1284,7 +1591,7 @@
       "sudo",
       "xcode-select",
       "--switch",
-      "/opt/flutter/xcode/9f2000/XCode.app"
+      "/opt/flutter/xcode/12a7209/XCode.app"
     ],
     "infra_step": true,
     "name": "select xcode (3)"
@@ -1316,7 +1623,7 @@
       "--json-output",
       "/path/to/tmp/json",
       "rmtree",
-      "/opt/flutter/xcode/9f2000"
+      "/opt/flutter/xcode/12a7209"
     ],
     "infra_step": true,
     "name": "Cleaning up Xcode cache (3)"
@@ -1357,16 +1664,28 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CLEANUP]/tmp_tmp_7/osx_sdk"
+    ],
+    "infra_step": true,
+    "name": "install xcode (4).Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
       "[CLEANUP]/tmp_tmp_7/osx_sdk/mac_toolchain",
       "install",
       "-kind",
       "ios",
       "-xcode-version",
-      "9f2000",
+      "12a7209",
       "-output-dir",
-      "/opt/flutter/xcode/9f2000/XCode.app",
+      "/opt/flutter/xcode/12a7209/XCode.app",
       "-cipd-package-prefix",
-      "flutter_internal/ios/xcode",
+      "infra_internal/ios/xcode",
       "-with-runtime=True",
       "-verbose"
     ],
@@ -1378,6 +1697,140 @@
     ]
   },
   {
+    "cmd": [],
+    "name": "Cleaning up runtimes cache (3)"
+  },
+  {
+    "cmd": [
+      "sudo",
+      "xcode-select",
+      "--switch",
+      "/opt/flutter/xcode/12a7209/XCode.app"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (3).select xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "runtime",
+      "delete",
+      "all"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (3).Cleaning up mounted simulator runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "xcodebuild",
+      "-version"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (3).check xcode version",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "list",
+      "runtimes"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (3).list runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "install runtimes (3)"
+  },
+  {
+    "cmd": [],
+    "name": "install runtimes (3).install xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[CLEANUP]/tmp_tmp_7/osx_sdk",
+      "-ensure-file",
+      "infra/tools/mac_toolchain/${platform} latest",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "infra_step": true,
+    "name": "install runtimes (3).install xcode.ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-latest----------\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      }@@@",
+      "@@@STEP_LOG_LINE@json.output@    ]@@@",
+      "@@@STEP_LOG_LINE@json.output@  }@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "ls",
+      "-al",
+      "[CLEANUP]/tmp_tmp_7/osx_sdk"
+    ],
+    "infra_step": true,
+    "name": "install runtimes (3).install xcode.Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[CLEANUP]/tmp_tmp_7/osx_sdk/mac_toolchain",
+      "install",
+      "-kind",
+      "ios",
+      "-xcode-version",
+      "12a7209",
+      "-output-dir",
+      "/opt/flutter/xcode/12a7209/XCode.app",
+      "-cipd-package-prefix",
+      "infra_internal/ios/xcode",
+      "-with-runtime=True",
+      "-verbose"
+    ],
+    "infra_step": true,
+    "name": "install runtimes (3).install xcode.install xcode from cipd",
+    "timeout": 1800,
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "killall",
       "-9",
@@ -1392,7 +1845,7 @@
       "sudo",
       "xcode-select",
       "--switch",
-      "/opt/flutter/xcode/9f2000/XCode.app"
+      "/opt/flutter/xcode/12a7209/XCode.app"
     ],
     "infra_step": true,
     "name": "select xcode (4)"
diff --git a/recipe_modules/flutter_deps/examples/full.expected/mac_old.json b/recipe_modules/flutter_deps/examples/full.expected/mac_old.json
index 29a4475..0db7e40 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/mac_old.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/mac_old.json
@@ -1,5 +1,12 @@
 [
   {
+    "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "name": "find macOS version"
+  },
+  {
     "cmd": [],
     "name": "OpenJDK dependency"
   },
@@ -934,7 +941,7 @@
   {
     "cmd": [
       "echo",
-      "[CACHE]/osx_sdk/xcode_9f2000"
+      "[CACHE]/osx_sdk/xcode_12a7209"
     ],
     "infra_step": true,
     "name": "show app_dir"
@@ -978,7 +985,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/osx_sdk/xcode_9f2000",
+      "[CACHE]/osx_sdk/xcode_12a7209",
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} latest",
       "-max-threads",
@@ -1005,16 +1012,28 @@
   },
   {
     "cmd": [
-      "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_12a7209"
+    ],
+    "infra_step": true,
+    "name": "install xcode.Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[CACHE]/osx_sdk/xcode_12a7209/mac_toolchain",
       "install",
       "-kind",
       "ios",
       "-xcode-version",
-      "9f2000",
+      "12a7209",
       "-output-dir",
-      "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
+      "[CACHE]/osx_sdk/xcode_12a7209/XCode.app",
       "-cipd-package-prefix",
-      "flutter_internal/ios/xcode",
+      "infra_internal/ios/xcode",
       "-with-runtime=True",
       "-verbose"
     ],
@@ -1040,7 +1059,7 @@
       "sudo",
       "xcode-select",
       "--switch",
-      "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
+      "[CACHE]/osx_sdk/xcode_12a7209/XCode.app"
     ],
     "infra_step": true,
     "name": "select xcode"
@@ -1066,13 +1085,9 @@
   },
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[CACHE]/osx_sdk/xcode_9f2000"
+      "rm",
+      "-rf",
+      "[CACHE]/osx_sdk/xcode_12a7209"
     ],
     "infra_step": true,
     "name": "Cleaning up Xcode cache"
@@ -1080,7 +1095,7 @@
   {
     "cmd": [
       "echo",
-      "[CACHE]/osx_sdk/xcode_9f2000"
+      "[CACHE]/osx_sdk/xcode_12a7209"
     ],
     "infra_step": true,
     "name": "show app_dir (2)"
@@ -1124,7 +1139,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/osx_sdk/xcode_9f2000",
+      "[CACHE]/osx_sdk/xcode_12a7209",
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} latest",
       "-max-threads",
@@ -1151,16 +1166,28 @@
   },
   {
     "cmd": [
-      "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_12a7209"
+    ],
+    "infra_step": true,
+    "name": "install xcode (2).Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[CACHE]/osx_sdk/xcode_12a7209/mac_toolchain",
       "install",
       "-kind",
       "ios",
       "-xcode-version",
-      "9f2000",
+      "12a7209",
       "-output-dir",
-      "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
+      "[CACHE]/osx_sdk/xcode_12a7209/XCode.app",
       "-cipd-package-prefix",
-      "flutter_internal/ios/xcode",
+      "infra_internal/ios/xcode",
       "-with-runtime=True",
       "-verbose"
     ],
@@ -1172,6 +1199,140 @@
     ]
   },
   {
+    "cmd": [],
+    "name": "Cleaning up runtimes cache"
+  },
+  {
+    "cmd": [
+      "sudo",
+      "xcode-select",
+      "--switch",
+      "[CACHE]/osx_sdk/xcode_12a7209/XCode.app"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache.select xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "runtime",
+      "delete",
+      "all"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache.Cleaning up mounted simulator runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "xcodebuild",
+      "-version"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache.check xcode version",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "list",
+      "runtimes"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache.list runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "install runtimes"
+  },
+  {
+    "cmd": [],
+    "name": "install runtimes.install xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[CACHE]/osx_sdk/xcode_12a7209",
+      "-ensure-file",
+      "infra/tools/mac_toolchain/${platform} latest",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "infra_step": true,
+    "name": "install runtimes.install xcode.ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-latest----------\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      }@@@",
+      "@@@STEP_LOG_LINE@json.output@    ]@@@",
+      "@@@STEP_LOG_LINE@json.output@  }@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_12a7209"
+    ],
+    "infra_step": true,
+    "name": "install runtimes.install xcode.Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[CACHE]/osx_sdk/xcode_12a7209/mac_toolchain",
+      "install",
+      "-kind",
+      "ios",
+      "-xcode-version",
+      "12a7209",
+      "-output-dir",
+      "[CACHE]/osx_sdk/xcode_12a7209/XCode.app",
+      "-cipd-package-prefix",
+      "infra_internal/ios/xcode",
+      "-with-runtime=True",
+      "-verbose"
+    ],
+    "infra_step": true,
+    "name": "install runtimes.install xcode.install xcode from cipd",
+    "timeout": 1800,
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "killall",
       "-9",
@@ -1186,7 +1347,7 @@
       "sudo",
       "xcode-select",
       "--switch",
-      "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
+      "[CACHE]/osx_sdk/xcode_12a7209/XCode.app"
     ],
     "infra_step": true,
     "name": "select xcode (2)"
@@ -1208,7 +1369,7 @@
       "--json-output",
       "/path/to/tmp/json",
       "rmtree",
-      "/opt/flutter/xcode/9f2000"
+      "/opt/flutter/xcode/12a7209"
     ],
     "infra_step": true,
     "name": "Cleaning up Xcode cache (2)"
@@ -1249,16 +1410,28 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CLEANUP]/tmp_tmp_6/osx_sdk"
+    ],
+    "infra_step": true,
+    "name": "install xcode (3).Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
       "[CLEANUP]/tmp_tmp_6/osx_sdk/mac_toolchain",
       "install",
       "-kind",
       "ios",
       "-xcode-version",
-      "9f2000",
+      "12a7209",
       "-output-dir",
-      "/opt/flutter/xcode/9f2000/XCode.app",
+      "/opt/flutter/xcode/12a7209/XCode.app",
       "-cipd-package-prefix",
-      "flutter_internal/ios/xcode",
+      "infra_internal/ios/xcode",
       "-with-runtime=True",
       "-verbose"
     ],
@@ -1270,6 +1443,140 @@
     ]
   },
   {
+    "cmd": [],
+    "name": "Cleaning up runtimes cache (2)"
+  },
+  {
+    "cmd": [
+      "sudo",
+      "xcode-select",
+      "--switch",
+      "/opt/flutter/xcode/12a7209/XCode.app"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (2).select xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "runtime",
+      "delete",
+      "all"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (2).Cleaning up mounted simulator runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "xcodebuild",
+      "-version"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (2).check xcode version",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "list",
+      "runtimes"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (2).list runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "install runtimes (2)"
+  },
+  {
+    "cmd": [],
+    "name": "install runtimes (2).install xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[CLEANUP]/tmp_tmp_6/osx_sdk",
+      "-ensure-file",
+      "infra/tools/mac_toolchain/${platform} latest",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "infra_step": true,
+    "name": "install runtimes (2).install xcode.ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-latest----------\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      }@@@",
+      "@@@STEP_LOG_LINE@json.output@    ]@@@",
+      "@@@STEP_LOG_LINE@json.output@  }@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "ls",
+      "-al",
+      "[CLEANUP]/tmp_tmp_6/osx_sdk"
+    ],
+    "infra_step": true,
+    "name": "install runtimes (2).install xcode.Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[CLEANUP]/tmp_tmp_6/osx_sdk/mac_toolchain",
+      "install",
+      "-kind",
+      "ios",
+      "-xcode-version",
+      "12a7209",
+      "-output-dir",
+      "/opt/flutter/xcode/12a7209/XCode.app",
+      "-cipd-package-prefix",
+      "infra_internal/ios/xcode",
+      "-with-runtime=True",
+      "-verbose"
+    ],
+    "infra_step": true,
+    "name": "install runtimes (2).install xcode.install xcode from cipd",
+    "timeout": 1800,
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "killall",
       "-9",
@@ -1284,7 +1591,7 @@
       "sudo",
       "xcode-select",
       "--switch",
-      "/opt/flutter/xcode/9f2000/XCode.app"
+      "/opt/flutter/xcode/12a7209/XCode.app"
     ],
     "infra_step": true,
     "name": "select xcode (3)"
@@ -1316,7 +1623,7 @@
       "--json-output",
       "/path/to/tmp/json",
       "rmtree",
-      "/opt/flutter/xcode/9f2000"
+      "/opt/flutter/xcode/12a7209"
     ],
     "infra_step": true,
     "name": "Cleaning up Xcode cache (3)"
@@ -1357,16 +1664,28 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CLEANUP]/tmp_tmp_7/osx_sdk"
+    ],
+    "infra_step": true,
+    "name": "install xcode (4).Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
       "[CLEANUP]/tmp_tmp_7/osx_sdk/mac_toolchain",
       "install",
       "-kind",
       "ios",
       "-xcode-version",
-      "9f2000",
+      "12a7209",
       "-output-dir",
-      "/opt/flutter/xcode/9f2000/XCode.app",
+      "/opt/flutter/xcode/12a7209/XCode.app",
       "-cipd-package-prefix",
-      "flutter_internal/ios/xcode",
+      "infra_internal/ios/xcode",
       "-with-runtime=True",
       "-verbose"
     ],
@@ -1378,6 +1697,140 @@
     ]
   },
   {
+    "cmd": [],
+    "name": "Cleaning up runtimes cache (3)"
+  },
+  {
+    "cmd": [
+      "sudo",
+      "xcode-select",
+      "--switch",
+      "/opt/flutter/xcode/12a7209/XCode.app"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (3).select xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "runtime",
+      "delete",
+      "all"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (3).Cleaning up mounted simulator runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "xcodebuild",
+      "-version"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (3).check xcode version",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "list",
+      "runtimes"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (3).list runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "install runtimes (3)"
+  },
+  {
+    "cmd": [],
+    "name": "install runtimes (3).install xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[CLEANUP]/tmp_tmp_7/osx_sdk",
+      "-ensure-file",
+      "infra/tools/mac_toolchain/${platform} latest",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "infra_step": true,
+    "name": "install runtimes (3).install xcode.ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-latest----------\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      }@@@",
+      "@@@STEP_LOG_LINE@json.output@    ]@@@",
+      "@@@STEP_LOG_LINE@json.output@  }@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "ls",
+      "-al",
+      "[CLEANUP]/tmp_tmp_7/osx_sdk"
+    ],
+    "infra_step": true,
+    "name": "install runtimes (3).install xcode.Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[CLEANUP]/tmp_tmp_7/osx_sdk/mac_toolchain",
+      "install",
+      "-kind",
+      "ios",
+      "-xcode-version",
+      "12a7209",
+      "-output-dir",
+      "/opt/flutter/xcode/12a7209/XCode.app",
+      "-cipd-package-prefix",
+      "infra_internal/ios/xcode",
+      "-with-runtime=True",
+      "-verbose"
+    ],
+    "infra_step": true,
+    "name": "install runtimes (3).install xcode.install xcode from cipd",
+    "timeout": 1800,
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "killall",
       "-9",
@@ -1392,7 +1845,7 @@
       "sudo",
       "xcode-select",
       "--switch",
-      "/opt/flutter/xcode/9f2000/XCode.app"
+      "/opt/flutter/xcode/12a7209/XCode.app"
     ],
     "infra_step": true,
     "name": "select xcode (4)"
diff --git a/recipe_modules/osx_sdk/api.py b/recipe_modules/osx_sdk/api.py
index 70bad65..1df8e38 100644
--- a/recipe_modules/osx_sdk/api.py
+++ b/recipe_modules/osx_sdk/api.py
@@ -72,7 +72,15 @@
       runtime_versions.sort(reverse=True)
       self._runtime_versions = runtime_versions
 
-    current_os = self.m.platform.mac_release
+    find_os = self.m.step(
+        "find macOS version",
+        ["sw_vers", "-productVersion"],
+        stdout=self.m.raw_io.output_text(),
+        step_test_data=(
+            lambda: self.m.raw_io.test_api.stream_output_text("14.4")
+        ),
+    )
+    current_os = self.m.version.parse(find_os.stdout.strip())
     if 'sdk_version' in self._sdk_properties:
       self._sdk_version = self._sdk_properties['sdk_version'].lower()
     else:
diff --git a/recipe_modules/osx_sdk/examples/full.expected/ancient_version.json b/recipe_modules/osx_sdk/examples/full.expected/ancient_version.json
index 98a52b9..40e4b90 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/ancient_version.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/ancient_version.json
@@ -1,6 +1,13 @@
 [
   {
     "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "name": "find macOS version"
+  },
+  {
+    "cmd": [
       "echo",
       "[CACHE]/osx_sdk/xcode_9c40b"
     ],
diff --git a/recipe_modules/osx_sdk/examples/full.expected/automatic_version.json b/recipe_modules/osx_sdk/examples/full.expected/automatic_version.json
index 1463d43..81e6cfd 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/automatic_version.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/automatic_version.json
@@ -1,6 +1,13 @@
 [
   {
     "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "name": "find macOS version"
+  },
+  {
+    "cmd": [
       "echo",
       "[CACHE]/osx_sdk/xcode_12a7209"
     ],
diff --git a/recipe_modules/osx_sdk/examples/full.expected/explicit_invalid_runtime_version_with_mac_13.json b/recipe_modules/osx_sdk/examples/full.expected/explicit_invalid_runtime_version_with_mac_13.json
index 383cd1b..f98c8df 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/explicit_invalid_runtime_version_with_mac_13.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/explicit_invalid_runtime_version_with_mac_13.json
@@ -1,6 +1,13 @@
 [
   {
     "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "name": "find macOS version"
+  },
+  {
+    "cmd": [
       "echo",
       "[CACHE]/osx_sdk/xcode_deadbeef"
     ],
diff --git a/recipe_modules/osx_sdk/examples/full.expected/explicit_package_source.json b/recipe_modules/osx_sdk/examples/full.expected/explicit_package_source.json
index 20ef848..2971f07 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/explicit_package_source.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/explicit_package_source.json
@@ -1,12 +1,15 @@
 [
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
+      "sw_vers",
+      "-productVersion"
+    ],
+    "name": "find macOS version"
+  },
+  {
+    "cmd": [
+      "rm",
+      "-rf",
       "[CACHE]/osx_sdk/xcode_deadbeef"
     ],
     "infra_step": true,
@@ -86,6 +89,18 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_deadbeef"
+    ],
+    "infra_step": true,
+    "name": "install xcode.Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
       "[CACHE]/osx_sdk/xcode_deadbeef/mac_toolchain",
       "install",
       "-kind",
@@ -107,6 +122,140 @@
     ]
   },
   {
+    "cmd": [],
+    "name": "Cleaning up runtimes cache"
+  },
+  {
+    "cmd": [
+      "sudo",
+      "xcode-select",
+      "--switch",
+      "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache.select xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "runtime",
+      "delete",
+      "all"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache.Cleaning up mounted simulator runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "xcodebuild",
+      "-version"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache.check xcode version",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "list",
+      "runtimes"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache.list runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "install runtimes"
+  },
+  {
+    "cmd": [],
+    "name": "install runtimes.install xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[CACHE]/osx_sdk/xcode_deadbeef",
+      "-ensure-file",
+      "infra/tools/mac_toolchain/${platform} 123abc",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "infra_step": true,
+    "name": "install runtimes.install xcode.ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-123abc----------\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      }@@@",
+      "@@@STEP_LOG_LINE@json.output@    ]@@@",
+      "@@@STEP_LOG_LINE@json.output@  }@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_deadbeef"
+    ],
+    "infra_step": true,
+    "name": "install runtimes.install xcode.Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[CACHE]/osx_sdk/xcode_deadbeef/mac_toolchain",
+      "install",
+      "-kind",
+      "mac",
+      "-xcode-version",
+      "deadbeef",
+      "-output-dir",
+      "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app",
+      "-cipd-package-prefix",
+      "some/package",
+      "-with-runtime=True",
+      "-verbose"
+    ],
+    "infra_step": true,
+    "name": "install runtimes.install xcode.install xcode from cipd",
+    "timeout": 1800,
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "killall",
       "-9",
@@ -147,12 +296,8 @@
   },
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
+      "rm",
+      "-rf",
       "[CACHE]/osx_sdk/xcode_deadbeef"
     ],
     "infra_step": true,
@@ -232,6 +377,18 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_deadbeef"
+    ],
+    "infra_step": true,
+    "name": "install xcode (2).Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
       "[CACHE]/osx_sdk/xcode_deadbeef/mac_toolchain",
       "install",
       "-kind",
@@ -253,6 +410,140 @@
     ]
   },
   {
+    "cmd": [],
+    "name": "Cleaning up runtimes cache (2)"
+  },
+  {
+    "cmd": [
+      "sudo",
+      "xcode-select",
+      "--switch",
+      "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (2).select xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "runtime",
+      "delete",
+      "all"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (2).Cleaning up mounted simulator runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "xcodebuild",
+      "-version"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (2).check xcode version",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "list",
+      "runtimes"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (2).list runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "install runtimes (2)"
+  },
+  {
+    "cmd": [],
+    "name": "install runtimes (2).install xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[CACHE]/osx_sdk/xcode_deadbeef",
+      "-ensure-file",
+      "infra/tools/mac_toolchain/${platform} 123abc",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "infra_step": true,
+    "name": "install runtimes (2).install xcode.ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-123abc----------\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      }@@@",
+      "@@@STEP_LOG_LINE@json.output@    ]@@@",
+      "@@@STEP_LOG_LINE@json.output@  }@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_deadbeef"
+    ],
+    "infra_step": true,
+    "name": "install runtimes (2).install xcode.Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[CACHE]/osx_sdk/xcode_deadbeef/mac_toolchain",
+      "install",
+      "-kind",
+      "mac",
+      "-xcode-version",
+      "deadbeef",
+      "-output-dir",
+      "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app",
+      "-cipd-package-prefix",
+      "some/package",
+      "-with-runtime=True",
+      "-verbose"
+    ],
+    "infra_step": true,
+    "name": "install runtimes (2).install xcode.install xcode from cipd",
+    "timeout": 1800,
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "killall",
       "-9",
@@ -355,6 +646,18 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CLEANUP]/tmp_tmp_1/osx_sdk"
+    ],
+    "infra_step": true,
+    "name": "install xcode (3).Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
       "[CLEANUP]/tmp_tmp_1/osx_sdk/mac_toolchain",
       "install",
       "-kind",
@@ -376,6 +679,140 @@
     ]
   },
   {
+    "cmd": [],
+    "name": "Cleaning up runtimes cache (3)"
+  },
+  {
+    "cmd": [
+      "sudo",
+      "xcode-select",
+      "--switch",
+      "/opt/flutter/xcode/deadbeef/XCode.app"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (3).select xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "runtime",
+      "delete",
+      "all"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (3).Cleaning up mounted simulator runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "xcodebuild",
+      "-version"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (3).check xcode version",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "list",
+      "runtimes"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (3).list runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "install runtimes (3)"
+  },
+  {
+    "cmd": [],
+    "name": "install runtimes (3).install xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[CLEANUP]/tmp_tmp_1/osx_sdk",
+      "-ensure-file",
+      "infra/tools/mac_toolchain/${platform} 123abc",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "infra_step": true,
+    "name": "install runtimes (3).install xcode.ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-123abc----------\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      }@@@",
+      "@@@STEP_LOG_LINE@json.output@    ]@@@",
+      "@@@STEP_LOG_LINE@json.output@  }@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "ls",
+      "-al",
+      "[CLEANUP]/tmp_tmp_1/osx_sdk"
+    ],
+    "infra_step": true,
+    "name": "install runtimes (3).install xcode.Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[CLEANUP]/tmp_tmp_1/osx_sdk/mac_toolchain",
+      "install",
+      "-kind",
+      "mac",
+      "-xcode-version",
+      "deadbeef",
+      "-output-dir",
+      "/opt/flutter/xcode/deadbeef/XCode.app",
+      "-cipd-package-prefix",
+      "some/package",
+      "-with-runtime=True",
+      "-verbose"
+    ],
+    "infra_step": true,
+    "name": "install runtimes (3).install xcode.install xcode from cipd",
+    "timeout": 1800,
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "killall",
       "-9",
@@ -463,6 +900,18 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CLEANUP]/tmp_tmp_2/osx_sdk"
+    ],
+    "infra_step": true,
+    "name": "install xcode (4).Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
       "[CLEANUP]/tmp_tmp_2/osx_sdk/mac_toolchain",
       "install",
       "-kind",
@@ -484,6 +933,140 @@
     ]
   },
   {
+    "cmd": [],
+    "name": "Cleaning up runtimes cache (4)"
+  },
+  {
+    "cmd": [
+      "sudo",
+      "xcode-select",
+      "--switch",
+      "/opt/flutter/xcode/deadbeef/XCode.app"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (4).select xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "runtime",
+      "delete",
+      "all"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (4).Cleaning up mounted simulator runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "xcodebuild",
+      "-version"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (4).check xcode version",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "list",
+      "runtimes"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (4).list runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "install runtimes (4)"
+  },
+  {
+    "cmd": [],
+    "name": "install runtimes (4).install xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[CLEANUP]/tmp_tmp_2/osx_sdk",
+      "-ensure-file",
+      "infra/tools/mac_toolchain/${platform} 123abc",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "infra_step": true,
+    "name": "install runtimes (4).install xcode.ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-123abc----------\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      }@@@",
+      "@@@STEP_LOG_LINE@json.output@    ]@@@",
+      "@@@STEP_LOG_LINE@json.output@  }@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "ls",
+      "-al",
+      "[CLEANUP]/tmp_tmp_2/osx_sdk"
+    ],
+    "infra_step": true,
+    "name": "install runtimes (4).install xcode.Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[CLEANUP]/tmp_tmp_2/osx_sdk/mac_toolchain",
+      "install",
+      "-kind",
+      "mac",
+      "-xcode-version",
+      "deadbeef",
+      "-output-dir",
+      "/opt/flutter/xcode/deadbeef/XCode.app",
+      "-cipd-package-prefix",
+      "some/package",
+      "-with-runtime=True",
+      "-verbose"
+    ],
+    "infra_step": true,
+    "name": "install runtimes (4).install xcode.install xcode from cipd",
+    "timeout": 1800,
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "killall",
       "-9",
diff --git a/recipe_modules/osx_sdk/examples/full.expected/explicit_runtime_version.json b/recipe_modules/osx_sdk/examples/full.expected/explicit_runtime_version.json
index 9ebdeb3..d8cae41 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/explicit_runtime_version.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/explicit_runtime_version.json
@@ -1,6 +1,13 @@
 [
   {
     "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "name": "find macOS version"
+  },
+  {
+    "cmd": [
       "echo",
       "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-14-0_ios-13-0"
     ],
diff --git a/recipe_modules/osx_sdk/examples/full.expected/explicit_version.json b/recipe_modules/osx_sdk/examples/full.expected/explicit_version.json
index 40a0587..bec9fd4 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/explicit_version.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/explicit_version.json
@@ -1,12 +1,15 @@
 [
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
+      "sw_vers",
+      "-productVersion"
+    ],
+    "name": "find macOS version"
+  },
+  {
+    "cmd": [
+      "rm",
+      "-rf",
       "[CACHE]/osx_sdk/xcode_deadbeef"
     ],
     "infra_step": true,
@@ -86,6 +89,18 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_deadbeef"
+    ],
+    "infra_step": true,
+    "name": "install xcode.Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
       "[CACHE]/osx_sdk/xcode_deadbeef/mac_toolchain",
       "install",
       "-kind",
@@ -95,7 +110,7 @@
       "-output-dir",
       "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app",
       "-cipd-package-prefix",
-      "flutter_internal/ios/xcode",
+      "infra_internal/ios/xcode",
       "-with-runtime=True",
       "-verbose"
     ],
@@ -107,6 +122,140 @@
     ]
   },
   {
+    "cmd": [],
+    "name": "Cleaning up runtimes cache"
+  },
+  {
+    "cmd": [
+      "sudo",
+      "xcode-select",
+      "--switch",
+      "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache.select xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "runtime",
+      "delete",
+      "all"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache.Cleaning up mounted simulator runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "xcodebuild",
+      "-version"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache.check xcode version",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "list",
+      "runtimes"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache.list runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "install runtimes"
+  },
+  {
+    "cmd": [],
+    "name": "install runtimes.install xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[CACHE]/osx_sdk/xcode_deadbeef",
+      "-ensure-file",
+      "infra/tools/mac_toolchain/${platform} 123abc",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "infra_step": true,
+    "name": "install runtimes.install xcode.ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-123abc----------\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      }@@@",
+      "@@@STEP_LOG_LINE@json.output@    ]@@@",
+      "@@@STEP_LOG_LINE@json.output@  }@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_deadbeef"
+    ],
+    "infra_step": true,
+    "name": "install runtimes.install xcode.Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[CACHE]/osx_sdk/xcode_deadbeef/mac_toolchain",
+      "install",
+      "-kind",
+      "mac",
+      "-xcode-version",
+      "deadbeef",
+      "-output-dir",
+      "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app",
+      "-cipd-package-prefix",
+      "infra_internal/ios/xcode",
+      "-with-runtime=True",
+      "-verbose"
+    ],
+    "infra_step": true,
+    "name": "install runtimes.install xcode.install xcode from cipd",
+    "timeout": 1800,
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "killall",
       "-9",
@@ -147,12 +296,8 @@
   },
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
+      "rm",
+      "-rf",
       "[CACHE]/osx_sdk/xcode_deadbeef"
     ],
     "infra_step": true,
@@ -232,6 +377,18 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_deadbeef"
+    ],
+    "infra_step": true,
+    "name": "install xcode (2).Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
       "[CACHE]/osx_sdk/xcode_deadbeef/mac_toolchain",
       "install",
       "-kind",
@@ -241,7 +398,7 @@
       "-output-dir",
       "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app",
       "-cipd-package-prefix",
-      "flutter_internal/ios/xcode",
+      "infra_internal/ios/xcode",
       "-with-runtime=True",
       "-verbose"
     ],
@@ -253,6 +410,140 @@
     ]
   },
   {
+    "cmd": [],
+    "name": "Cleaning up runtimes cache (2)"
+  },
+  {
+    "cmd": [
+      "sudo",
+      "xcode-select",
+      "--switch",
+      "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (2).select xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "runtime",
+      "delete",
+      "all"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (2).Cleaning up mounted simulator runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "xcodebuild",
+      "-version"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (2).check xcode version",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "list",
+      "runtimes"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (2).list runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "install runtimes (2)"
+  },
+  {
+    "cmd": [],
+    "name": "install runtimes (2).install xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[CACHE]/osx_sdk/xcode_deadbeef",
+      "-ensure-file",
+      "infra/tools/mac_toolchain/${platform} 123abc",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "infra_step": true,
+    "name": "install runtimes (2).install xcode.ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-123abc----------\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      }@@@",
+      "@@@STEP_LOG_LINE@json.output@    ]@@@",
+      "@@@STEP_LOG_LINE@json.output@  }@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_deadbeef"
+    ],
+    "infra_step": true,
+    "name": "install runtimes (2).install xcode.Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[CACHE]/osx_sdk/xcode_deadbeef/mac_toolchain",
+      "install",
+      "-kind",
+      "mac",
+      "-xcode-version",
+      "deadbeef",
+      "-output-dir",
+      "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app",
+      "-cipd-package-prefix",
+      "infra_internal/ios/xcode",
+      "-with-runtime=True",
+      "-verbose"
+    ],
+    "infra_step": true,
+    "name": "install runtimes (2).install xcode.install xcode from cipd",
+    "timeout": 1800,
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "killall",
       "-9",
@@ -355,6 +646,18 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CLEANUP]/tmp_tmp_1/osx_sdk"
+    ],
+    "infra_step": true,
+    "name": "install xcode (3).Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
       "[CLEANUP]/tmp_tmp_1/osx_sdk/mac_toolchain",
       "install",
       "-kind",
@@ -364,7 +667,7 @@
       "-output-dir",
       "/opt/flutter/xcode/deadbeef/XCode.app",
       "-cipd-package-prefix",
-      "flutter_internal/ios/xcode",
+      "infra_internal/ios/xcode",
       "-with-runtime=True",
       "-verbose"
     ],
@@ -376,6 +679,140 @@
     ]
   },
   {
+    "cmd": [],
+    "name": "Cleaning up runtimes cache (3)"
+  },
+  {
+    "cmd": [
+      "sudo",
+      "xcode-select",
+      "--switch",
+      "/opt/flutter/xcode/deadbeef/XCode.app"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (3).select xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "runtime",
+      "delete",
+      "all"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (3).Cleaning up mounted simulator runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "xcodebuild",
+      "-version"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (3).check xcode version",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "list",
+      "runtimes"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (3).list runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "install runtimes (3)"
+  },
+  {
+    "cmd": [],
+    "name": "install runtimes (3).install xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[CLEANUP]/tmp_tmp_1/osx_sdk",
+      "-ensure-file",
+      "infra/tools/mac_toolchain/${platform} 123abc",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "infra_step": true,
+    "name": "install runtimes (3).install xcode.ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-123abc----------\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      }@@@",
+      "@@@STEP_LOG_LINE@json.output@    ]@@@",
+      "@@@STEP_LOG_LINE@json.output@  }@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "ls",
+      "-al",
+      "[CLEANUP]/tmp_tmp_1/osx_sdk"
+    ],
+    "infra_step": true,
+    "name": "install runtimes (3).install xcode.Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[CLEANUP]/tmp_tmp_1/osx_sdk/mac_toolchain",
+      "install",
+      "-kind",
+      "mac",
+      "-xcode-version",
+      "deadbeef",
+      "-output-dir",
+      "/opt/flutter/xcode/deadbeef/XCode.app",
+      "-cipd-package-prefix",
+      "infra_internal/ios/xcode",
+      "-with-runtime=True",
+      "-verbose"
+    ],
+    "infra_step": true,
+    "name": "install runtimes (3).install xcode.install xcode from cipd",
+    "timeout": 1800,
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "killall",
       "-9",
@@ -463,6 +900,18 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CLEANUP]/tmp_tmp_2/osx_sdk"
+    ],
+    "infra_step": true,
+    "name": "install xcode (4).Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
       "[CLEANUP]/tmp_tmp_2/osx_sdk/mac_toolchain",
       "install",
       "-kind",
@@ -472,7 +921,7 @@
       "-output-dir",
       "/opt/flutter/xcode/deadbeef/XCode.app",
       "-cipd-package-prefix",
-      "flutter_internal/ios/xcode",
+      "infra_internal/ios/xcode",
       "-with-runtime=True",
       "-verbose"
     ],
@@ -484,6 +933,140 @@
     ]
   },
   {
+    "cmd": [],
+    "name": "Cleaning up runtimes cache (4)"
+  },
+  {
+    "cmd": [
+      "sudo",
+      "xcode-select",
+      "--switch",
+      "/opt/flutter/xcode/deadbeef/XCode.app"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (4).select xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "runtime",
+      "delete",
+      "all"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (4).Cleaning up mounted simulator runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "xcodebuild",
+      "-version"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (4).check xcode version",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "list",
+      "runtimes"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (4).list runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "install runtimes (4)"
+  },
+  {
+    "cmd": [],
+    "name": "install runtimes (4).install xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[CLEANUP]/tmp_tmp_2/osx_sdk",
+      "-ensure-file",
+      "infra/tools/mac_toolchain/${platform} 123abc",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "infra_step": true,
+    "name": "install runtimes (4).install xcode.ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-123abc----------\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      }@@@",
+      "@@@STEP_LOG_LINE@json.output@    ]@@@",
+      "@@@STEP_LOG_LINE@json.output@  }@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "ls",
+      "-al",
+      "[CLEANUP]/tmp_tmp_2/osx_sdk"
+    ],
+    "infra_step": true,
+    "name": "install runtimes (4).install xcode.Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[CLEANUP]/tmp_tmp_2/osx_sdk/mac_toolchain",
+      "install",
+      "-kind",
+      "mac",
+      "-xcode-version",
+      "deadbeef",
+      "-output-dir",
+      "/opt/flutter/xcode/deadbeef/XCode.app",
+      "-cipd-package-prefix",
+      "infra_internal/ios/xcode",
+      "-with-runtime=True",
+      "-verbose"
+    ],
+    "infra_step": true,
+    "name": "install runtimes (4).install xcode.install xcode from cipd",
+    "timeout": 1800,
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "killall",
       "-9",
diff --git a/recipe_modules/osx_sdk/examples/full.expected/failed_to_delete_runtimes_err_in_stderr.json b/recipe_modules/osx_sdk/examples/full.expected/failed_to_delete_runtimes_err_in_stderr.json
index 965a93a..3044bee 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/failed_to_delete_runtimes_err_in_stderr.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/failed_to_delete_runtimes_err_in_stderr.json
@@ -1,6 +1,13 @@
 [
   {
     "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "name": "find macOS version"
+  },
+  {
+    "cmd": [
       "rm",
       "-rf",
       "[CACHE]/osx_sdk/xcode_deadbeef"
diff --git a/recipe_modules/osx_sdk/examples/full.expected/failed_to_delete_runtimes_err_in_stdout.json b/recipe_modules/osx_sdk/examples/full.expected/failed_to_delete_runtimes_err_in_stdout.json
index 92aa58a..9c1bdcc 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/failed_to_delete_runtimes_err_in_stdout.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/failed_to_delete_runtimes_err_in_stdout.json
@@ -1,6 +1,13 @@
 [
   {
     "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "name": "find macOS version"
+  },
+  {
+    "cmd": [
       "rm",
       "-rf",
       "[CACHE]/osx_sdk/xcode_deadbeef"
diff --git a/recipe_modules/osx_sdk/examples/full.expected/mac.json b/recipe_modules/osx_sdk/examples/full.expected/mac.json
index 9747810..d8e747f 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/mac.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/mac.json
@@ -1,8 +1,15 @@
 [
   {
     "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "name": "find macOS version"
+  },
+  {
+    "cmd": [
       "echo",
-      "[CACHE]/osx_sdk/xcode_9f2000"
+      "[CACHE]/osx_sdk/xcode_12a7209"
     ],
     "infra_step": true,
     "name": "show app_dir"
@@ -46,7 +53,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/osx_sdk/xcode_9f2000",
+      "[CACHE]/osx_sdk/xcode_12a7209",
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} latest",
       "-max-threads",
@@ -73,16 +80,28 @@
   },
   {
     "cmd": [
-      "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_12a7209"
+    ],
+    "infra_step": true,
+    "name": "install xcode.Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[CACHE]/osx_sdk/xcode_12a7209/mac_toolchain",
       "install",
       "-kind",
       "mac",
       "-xcode-version",
-      "9f2000",
+      "12a7209",
       "-output-dir",
-      "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
+      "[CACHE]/osx_sdk/xcode_12a7209/XCode.app",
       "-cipd-package-prefix",
-      "flutter_internal/ios/xcode",
+      "infra_internal/ios/xcode",
       "-with-runtime=True",
       "-verbose"
     ],
@@ -108,7 +127,7 @@
       "sudo",
       "xcode-select",
       "--switch",
-      "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
+      "[CACHE]/osx_sdk/xcode_12a7209/XCode.app"
     ],
     "infra_step": true,
     "name": "select xcode"
@@ -134,13 +153,9 @@
   },
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[CACHE]/osx_sdk/xcode_9f2000"
+      "rm",
+      "-rf",
+      "[CACHE]/osx_sdk/xcode_12a7209"
     ],
     "infra_step": true,
     "name": "Cleaning up Xcode cache"
@@ -148,7 +163,7 @@
   {
     "cmd": [
       "echo",
-      "[CACHE]/osx_sdk/xcode_9f2000"
+      "[CACHE]/osx_sdk/xcode_12a7209"
     ],
     "infra_step": true,
     "name": "show app_dir (2)"
@@ -192,7 +207,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/osx_sdk/xcode_9f2000",
+      "[CACHE]/osx_sdk/xcode_12a7209",
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} latest",
       "-max-threads",
@@ -219,16 +234,28 @@
   },
   {
     "cmd": [
-      "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_12a7209"
+    ],
+    "infra_step": true,
+    "name": "install xcode (2).Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[CACHE]/osx_sdk/xcode_12a7209/mac_toolchain",
       "install",
       "-kind",
       "mac",
       "-xcode-version",
-      "9f2000",
+      "12a7209",
       "-output-dir",
-      "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
+      "[CACHE]/osx_sdk/xcode_12a7209/XCode.app",
       "-cipd-package-prefix",
-      "flutter_internal/ios/xcode",
+      "infra_internal/ios/xcode",
       "-with-runtime=True",
       "-verbose"
     ],
@@ -240,6 +267,140 @@
     ]
   },
   {
+    "cmd": [],
+    "name": "Cleaning up runtimes cache"
+  },
+  {
+    "cmd": [
+      "sudo",
+      "xcode-select",
+      "--switch",
+      "[CACHE]/osx_sdk/xcode_12a7209/XCode.app"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache.select xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "runtime",
+      "delete",
+      "all"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache.Cleaning up mounted simulator runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "xcodebuild",
+      "-version"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache.check xcode version",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "list",
+      "runtimes"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache.list runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "install runtimes"
+  },
+  {
+    "cmd": [],
+    "name": "install runtimes.install xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[CACHE]/osx_sdk/xcode_12a7209",
+      "-ensure-file",
+      "infra/tools/mac_toolchain/${platform} latest",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "infra_step": true,
+    "name": "install runtimes.install xcode.ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-latest----------\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      }@@@",
+      "@@@STEP_LOG_LINE@json.output@    ]@@@",
+      "@@@STEP_LOG_LINE@json.output@  }@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_12a7209"
+    ],
+    "infra_step": true,
+    "name": "install runtimes.install xcode.Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[CACHE]/osx_sdk/xcode_12a7209/mac_toolchain",
+      "install",
+      "-kind",
+      "mac",
+      "-xcode-version",
+      "12a7209",
+      "-output-dir",
+      "[CACHE]/osx_sdk/xcode_12a7209/XCode.app",
+      "-cipd-package-prefix",
+      "infra_internal/ios/xcode",
+      "-with-runtime=True",
+      "-verbose"
+    ],
+    "infra_step": true,
+    "name": "install runtimes.install xcode.install xcode from cipd",
+    "timeout": 1800,
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "killall",
       "-9",
@@ -254,7 +415,7 @@
       "sudo",
       "xcode-select",
       "--switch",
-      "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
+      "[CACHE]/osx_sdk/xcode_12a7209/XCode.app"
     ],
     "infra_step": true,
     "name": "select xcode (2)"
@@ -301,7 +462,7 @@
       "--json-output",
       "/path/to/tmp/json",
       "rmtree",
-      "/opt/flutter/xcode/9f2000"
+      "/opt/flutter/xcode/12a7209"
     ],
     "infra_step": true,
     "name": "Cleaning up Xcode cache (2)"
@@ -342,16 +503,28 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CLEANUP]/tmp_tmp_1/osx_sdk"
+    ],
+    "infra_step": true,
+    "name": "install xcode (3).Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
       "[CLEANUP]/tmp_tmp_1/osx_sdk/mac_toolchain",
       "install",
       "-kind",
       "mac",
       "-xcode-version",
-      "9f2000",
+      "12a7209",
       "-output-dir",
-      "/opt/flutter/xcode/9f2000/XCode.app",
+      "/opt/flutter/xcode/12a7209/XCode.app",
       "-cipd-package-prefix",
-      "flutter_internal/ios/xcode",
+      "infra_internal/ios/xcode",
       "-with-runtime=True",
       "-verbose"
     ],
@@ -363,6 +536,140 @@
     ]
   },
   {
+    "cmd": [],
+    "name": "Cleaning up runtimes cache (2)"
+  },
+  {
+    "cmd": [
+      "sudo",
+      "xcode-select",
+      "--switch",
+      "/opt/flutter/xcode/12a7209/XCode.app"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (2).select xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "runtime",
+      "delete",
+      "all"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (2).Cleaning up mounted simulator runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "xcodebuild",
+      "-version"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (2).check xcode version",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "list",
+      "runtimes"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (2).list runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "install runtimes (2)"
+  },
+  {
+    "cmd": [],
+    "name": "install runtimes (2).install xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[CLEANUP]/tmp_tmp_1/osx_sdk",
+      "-ensure-file",
+      "infra/tools/mac_toolchain/${platform} latest",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "infra_step": true,
+    "name": "install runtimes (2).install xcode.ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-latest----------\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      }@@@",
+      "@@@STEP_LOG_LINE@json.output@    ]@@@",
+      "@@@STEP_LOG_LINE@json.output@  }@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "ls",
+      "-al",
+      "[CLEANUP]/tmp_tmp_1/osx_sdk"
+    ],
+    "infra_step": true,
+    "name": "install runtimes (2).install xcode.Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[CLEANUP]/tmp_tmp_1/osx_sdk/mac_toolchain",
+      "install",
+      "-kind",
+      "mac",
+      "-xcode-version",
+      "12a7209",
+      "-output-dir",
+      "/opt/flutter/xcode/12a7209/XCode.app",
+      "-cipd-package-prefix",
+      "infra_internal/ios/xcode",
+      "-with-runtime=True",
+      "-verbose"
+    ],
+    "infra_step": true,
+    "name": "install runtimes (2).install xcode.install xcode from cipd",
+    "timeout": 1800,
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "killall",
       "-9",
@@ -377,7 +684,7 @@
       "sudo",
       "xcode-select",
       "--switch",
-      "/opt/flutter/xcode/9f2000/XCode.app"
+      "/opt/flutter/xcode/12a7209/XCode.app"
     ],
     "infra_step": true,
     "name": "select xcode (3)"
@@ -409,7 +716,7 @@
       "--json-output",
       "/path/to/tmp/json",
       "rmtree",
-      "/opt/flutter/xcode/9f2000"
+      "/opt/flutter/xcode/12a7209"
     ],
     "infra_step": true,
     "name": "Cleaning up Xcode cache (3)"
@@ -450,16 +757,28 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CLEANUP]/tmp_tmp_2/osx_sdk"
+    ],
+    "infra_step": true,
+    "name": "install xcode (4).Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
       "[CLEANUP]/tmp_tmp_2/osx_sdk/mac_toolchain",
       "install",
       "-kind",
       "mac",
       "-xcode-version",
-      "9f2000",
+      "12a7209",
       "-output-dir",
-      "/opt/flutter/xcode/9f2000/XCode.app",
+      "/opt/flutter/xcode/12a7209/XCode.app",
       "-cipd-package-prefix",
-      "flutter_internal/ios/xcode",
+      "infra_internal/ios/xcode",
       "-with-runtime=True",
       "-verbose"
     ],
@@ -471,6 +790,140 @@
     ]
   },
   {
+    "cmd": [],
+    "name": "Cleaning up runtimes cache (3)"
+  },
+  {
+    "cmd": [
+      "sudo",
+      "xcode-select",
+      "--switch",
+      "/opt/flutter/xcode/12a7209/XCode.app"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (3).select xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "runtime",
+      "delete",
+      "all"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (3).Cleaning up mounted simulator runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "xcodebuild",
+      "-version"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (3).check xcode version",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "list",
+      "runtimes"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (3).list runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "install runtimes (3)"
+  },
+  {
+    "cmd": [],
+    "name": "install runtimes (3).install xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[CLEANUP]/tmp_tmp_2/osx_sdk",
+      "-ensure-file",
+      "infra/tools/mac_toolchain/${platform} latest",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "infra_step": true,
+    "name": "install runtimes (3).install xcode.ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-latest----------\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      }@@@",
+      "@@@STEP_LOG_LINE@json.output@    ]@@@",
+      "@@@STEP_LOG_LINE@json.output@  }@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "ls",
+      "-al",
+      "[CLEANUP]/tmp_tmp_2/osx_sdk"
+    ],
+    "infra_step": true,
+    "name": "install runtimes (3).install xcode.Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[CLEANUP]/tmp_tmp_2/osx_sdk/mac_toolchain",
+      "install",
+      "-kind",
+      "mac",
+      "-xcode-version",
+      "12a7209",
+      "-output-dir",
+      "/opt/flutter/xcode/12a7209/XCode.app",
+      "-cipd-package-prefix",
+      "infra_internal/ios/xcode",
+      "-with-runtime=True",
+      "-verbose"
+    ],
+    "infra_step": true,
+    "name": "install runtimes (3).install xcode.install xcode from cipd",
+    "timeout": 1800,
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "killall",
       "-9",
@@ -485,7 +938,7 @@
       "sudo",
       "xcode-select",
       "--switch",
-      "/opt/flutter/xcode/9f2000/XCode.app"
+      "/opt/flutter/xcode/12a7209/XCode.app"
     ],
     "infra_step": true,
     "name": "select xcode (4)"
diff --git a/recipe_modules/osx_sdk/examples/full.expected/mac_13_arm_host.json b/recipe_modules/osx_sdk/examples/full.expected/mac_13_arm_host.json
index b55cd24..678965c 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/mac_13_arm_host.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/mac_13_arm_host.json
@@ -1,6 +1,13 @@
 [
   {
     "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "name": "find macOS version"
+  },
+  {
+    "cmd": [
       "echo",
       "[CACHE]/osx_sdk/xcode_deadbeef"
     ],
diff --git a/recipe_modules/osx_sdk/examples/full.expected/mac_13_cleanup_no_runtimes.json b/recipe_modules/osx_sdk/examples/full.expected/mac_13_cleanup_no_runtimes.json
index 515d2a6..bec9fd4 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/mac_13_cleanup_no_runtimes.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/mac_13_cleanup_no_runtimes.json
@@ -1,6 +1,13 @@
 [
   {
     "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "name": "find macOS version"
+  },
+  {
+    "cmd": [
       "rm",
       "-rf",
       "[CACHE]/osx_sdk/xcode_deadbeef"
diff --git a/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_already_mounted.json b/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_already_mounted.json
index 60638f3..4ebee9f 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_already_mounted.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_already_mounted.json
@@ -1,6 +1,13 @@
 [
   {
     "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "name": "find macOS version"
+  },
+  {
+    "cmd": [
       "echo",
       "[CACHE]/osx_sdk/xcode_deadbeef"
     ],
diff --git a/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_build_verion_failure.json b/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_build_verion_failure.json
index 1494ee8..04d0294 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_build_verion_failure.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_build_verion_failure.json
@@ -1,6 +1,13 @@
 [
   {
     "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "name": "find macOS version"
+  },
+  {
+    "cmd": [
       "echo",
       "[CACHE]/osx_sdk/xcode_deadbeef"
     ],
diff --git a/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_clean.json b/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_clean.json
index 0dafede..272d9b6 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_clean.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_clean.json
@@ -1,6 +1,13 @@
 [
   {
     "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "name": "find macOS version"
+  },
+  {
+    "cmd": [
       "rm",
       "-rf",
       "[CACHE]/osx_sdk/xcode_deadbeef"
diff --git a/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_fails_to_find_dmg.json b/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_fails_to_find_dmg.json
index 39addcd..dc0741a 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_fails_to_find_dmg.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_fails_to_find_dmg.json
@@ -1,6 +1,13 @@
 [
   {
     "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "name": "find macOS version"
+  },
+  {
+    "cmd": [
       "echo",
       "[CACHE]/osx_sdk/xcode_deadbeef"
     ],
diff --git a/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_not_mounted.json b/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_not_mounted.json
index f1ee558..aaefc91 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_not_mounted.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_not_mounted.json
@@ -1,6 +1,13 @@
 [
   {
     "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "name": "find macOS version"
+  },
+  {
+    "cmd": [
       "echo",
       "[CACHE]/osx_sdk/xcode_deadbeef"
     ],
diff --git a/recipe_modules/osx_sdk/examples/full.expected/mac_13_x86_host.json b/recipe_modules/osx_sdk/examples/full.expected/mac_13_x86_host.json
index 73985d1..6b96260 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/mac_13_x86_host.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/mac_13_x86_host.json
@@ -1,6 +1,13 @@
 [
   {
     "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "name": "find macOS version"
+  },
+  {
+    "cmd": [
       "echo",
       "[CACHE]/osx_sdk/xcode_deadbeef"
     ],
diff --git a/recipe_modules/osx_sdk/examples/full.expected/no_runtime_version.json b/recipe_modules/osx_sdk/examples/full.expected/no_runtime_version.json
index 43b6dab..f322f9a 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/no_runtime_version.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/no_runtime_version.json
@@ -1,6 +1,13 @@
 [
   {
     "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "name": "find macOS version"
+  },
+  {
+    "cmd": [
       "echo",
       "[CACHE]/osx_sdk/xcode_deadbeef"
     ],
@@ -139,6 +146,18 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_deadbeef"
+    ],
+    "infra_step": true,
+    "name": "install xcode.Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
       "[CACHE]/osx_sdk/xcode_deadbeef/mac_toolchain",
       "install",
       "-kind",
@@ -148,7 +167,7 @@
       "-output-dir",
       "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app",
       "-cipd-package-prefix",
-      "flutter_internal/ios/xcode",
+      "infra_internal/ios/xcode",
       "-with-runtime=True",
       "-verbose"
     ],
@@ -200,12 +219,8 @@
   },
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
+      "rm",
+      "-rf",
       "[CACHE]/osx_sdk/xcode_deadbeef"
     ],
     "infra_step": true,
@@ -263,6 +278,63 @@
     "name": "install xcode (2)"
   },
   {
+    "cmd": [],
+    "name": "install xcode (2).verify xcode [CACHE]/osx_sdk/xcode_deadbeef/XCode.app",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "sudo",
+      "xcode-select",
+      "--switch",
+      "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app"
+    ],
+    "infra_step": true,
+    "name": "install xcode (2).verify xcode [CACHE]/osx_sdk/xcode_deadbeef/XCode.app.select xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "xcodebuild",
+      "-version"
+    ],
+    "infra_step": true,
+    "name": "install xcode (2).verify xcode [CACHE]/osx_sdk/xcode_deadbeef/XCode.app.check xcode version",
+    "timeout": 300,
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "sudo",
+      "xcode-select",
+      "--reset"
+    ],
+    "infra_step": true,
+    "name": "install xcode (2).verify xcode [CACHE]/osx_sdk/xcode_deadbeef/XCode.app.reset XCode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "killall",
+      "-9",
+      "CoreServicesUIAgent"
+    ],
+    "infra_step": true,
+    "name": "install xcode (2).verify xcode [CACHE]/osx_sdk/xcode_deadbeef/XCode.app.dismiss damaged notification",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "cipd",
       "ensure",
@@ -294,6 +366,18 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_deadbeef"
+    ],
+    "infra_step": true,
+    "name": "install xcode (2).Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
       "[CACHE]/osx_sdk/xcode_deadbeef/mac_toolchain",
       "install",
       "-kind",
@@ -303,7 +387,7 @@
       "-output-dir",
       "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app",
       "-cipd-package-prefix",
-      "flutter_internal/ios/xcode",
+      "infra_internal/ios/xcode",
       "-with-runtime=True",
       "-verbose"
     ],
@@ -315,6 +399,197 @@
     ]
   },
   {
+    "cmd": [],
+    "name": "Cleaning up runtimes cache"
+  },
+  {
+    "cmd": [
+      "sudo",
+      "xcode-select",
+      "--switch",
+      "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache.select xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "runtime",
+      "delete",
+      "all"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache.Cleaning up mounted simulator runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "xcodebuild",
+      "-version"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache.check xcode version",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "list",
+      "runtimes"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache.list runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "install runtimes"
+  },
+  {
+    "cmd": [],
+    "name": "install runtimes.install xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "install runtimes.install xcode.verify xcode [CACHE]/osx_sdk/xcode_deadbeef/XCode.app",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "sudo",
+      "xcode-select",
+      "--switch",
+      "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app"
+    ],
+    "infra_step": true,
+    "name": "install runtimes.install xcode.verify xcode [CACHE]/osx_sdk/xcode_deadbeef/XCode.app.select xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@3@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "xcodebuild",
+      "-version"
+    ],
+    "infra_step": true,
+    "name": "install runtimes.install xcode.verify xcode [CACHE]/osx_sdk/xcode_deadbeef/XCode.app.check xcode version",
+    "timeout": 300,
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@3@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "sudo",
+      "xcode-select",
+      "--reset"
+    ],
+    "infra_step": true,
+    "name": "install runtimes.install xcode.verify xcode [CACHE]/osx_sdk/xcode_deadbeef/XCode.app.reset XCode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@3@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "killall",
+      "-9",
+      "CoreServicesUIAgent"
+    ],
+    "infra_step": true,
+    "name": "install runtimes.install xcode.verify xcode [CACHE]/osx_sdk/xcode_deadbeef/XCode.app.dismiss damaged notification",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@3@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[CACHE]/osx_sdk/xcode_deadbeef",
+      "-ensure-file",
+      "infra/tools/mac_toolchain/${platform} 123abc",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "infra_step": true,
+    "name": "install runtimes.install xcode.ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-123abc----------\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      }@@@",
+      "@@@STEP_LOG_LINE@json.output@    ]@@@",
+      "@@@STEP_LOG_LINE@json.output@  }@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_deadbeef"
+    ],
+    "infra_step": true,
+    "name": "install runtimes.install xcode.Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[CACHE]/osx_sdk/xcode_deadbeef/mac_toolchain",
+      "install",
+      "-kind",
+      "mac",
+      "-xcode-version",
+      "deadbeef",
+      "-output-dir",
+      "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app",
+      "-cipd-package-prefix",
+      "infra_internal/ios/xcode",
+      "-with-runtime=True",
+      "-verbose"
+    ],
+    "infra_step": true,
+    "name": "install runtimes.install xcode.install xcode from cipd",
+    "timeout": 1800,
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "killall",
       "-9",
@@ -417,6 +692,18 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CLEANUP]/tmp_tmp_1/osx_sdk"
+    ],
+    "infra_step": true,
+    "name": "install xcode (3).Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
       "[CLEANUP]/tmp_tmp_1/osx_sdk/mac_toolchain",
       "install",
       "-kind",
@@ -426,7 +713,7 @@
       "-output-dir",
       "/opt/flutter/xcode/deadbeef/XCode.app",
       "-cipd-package-prefix",
-      "flutter_internal/ios/xcode",
+      "infra_internal/ios/xcode",
       "-with-runtime=True",
       "-verbose"
     ],
@@ -438,6 +725,140 @@
     ]
   },
   {
+    "cmd": [],
+    "name": "Cleaning up runtimes cache (2)"
+  },
+  {
+    "cmd": [
+      "sudo",
+      "xcode-select",
+      "--switch",
+      "/opt/flutter/xcode/deadbeef/XCode.app"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (2).select xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "runtime",
+      "delete",
+      "all"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (2).Cleaning up mounted simulator runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "xcodebuild",
+      "-version"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (2).check xcode version",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "list",
+      "runtimes"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (2).list runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "install runtimes (2)"
+  },
+  {
+    "cmd": [],
+    "name": "install runtimes (2).install xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[CLEANUP]/tmp_tmp_1/osx_sdk",
+      "-ensure-file",
+      "infra/tools/mac_toolchain/${platform} 123abc",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "infra_step": true,
+    "name": "install runtimes (2).install xcode.ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-123abc----------\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      }@@@",
+      "@@@STEP_LOG_LINE@json.output@    ]@@@",
+      "@@@STEP_LOG_LINE@json.output@  }@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "ls",
+      "-al",
+      "[CLEANUP]/tmp_tmp_1/osx_sdk"
+    ],
+    "infra_step": true,
+    "name": "install runtimes (2).install xcode.Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[CLEANUP]/tmp_tmp_1/osx_sdk/mac_toolchain",
+      "install",
+      "-kind",
+      "mac",
+      "-xcode-version",
+      "deadbeef",
+      "-output-dir",
+      "/opt/flutter/xcode/deadbeef/XCode.app",
+      "-cipd-package-prefix",
+      "infra_internal/ios/xcode",
+      "-with-runtime=True",
+      "-verbose"
+    ],
+    "infra_step": true,
+    "name": "install runtimes (2).install xcode.install xcode from cipd",
+    "timeout": 1800,
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "killall",
       "-9",
@@ -525,6 +946,18 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CLEANUP]/tmp_tmp_2/osx_sdk"
+    ],
+    "infra_step": true,
+    "name": "install xcode (4).Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
       "[CLEANUP]/tmp_tmp_2/osx_sdk/mac_toolchain",
       "install",
       "-kind",
@@ -534,7 +967,7 @@
       "-output-dir",
       "/opt/flutter/xcode/deadbeef/XCode.app",
       "-cipd-package-prefix",
-      "flutter_internal/ios/xcode",
+      "infra_internal/ios/xcode",
       "-with-runtime=True",
       "-verbose"
     ],
@@ -546,6 +979,140 @@
     ]
   },
   {
+    "cmd": [],
+    "name": "Cleaning up runtimes cache (3)"
+  },
+  {
+    "cmd": [
+      "sudo",
+      "xcode-select",
+      "--switch",
+      "/opt/flutter/xcode/deadbeef/XCode.app"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (3).select xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "runtime",
+      "delete",
+      "all"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (3).Cleaning up mounted simulator runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "xcodebuild",
+      "-version"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (3).check xcode version",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "list",
+      "runtimes"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up runtimes cache (3).list runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "install runtimes (3)"
+  },
+  {
+    "cmd": [],
+    "name": "install runtimes (3).install xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[CLEANUP]/tmp_tmp_2/osx_sdk",
+      "-ensure-file",
+      "infra/tools/mac_toolchain/${platform} 123abc",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "infra_step": true,
+    "name": "install runtimes (3).install xcode.ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-123abc----------\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      }@@@",
+      "@@@STEP_LOG_LINE@json.output@    ]@@@",
+      "@@@STEP_LOG_LINE@json.output@  }@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "ls",
+      "-al",
+      "[CLEANUP]/tmp_tmp_2/osx_sdk"
+    ],
+    "infra_step": true,
+    "name": "install runtimes (3).install xcode.Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[CLEANUP]/tmp_tmp_2/osx_sdk/mac_toolchain",
+      "install",
+      "-kind",
+      "mac",
+      "-xcode-version",
+      "deadbeef",
+      "-output-dir",
+      "/opt/flutter/xcode/deadbeef/XCode.app",
+      "-cipd-package-prefix",
+      "infra_internal/ios/xcode",
+      "-with-runtime=True",
+      "-verbose"
+    ],
+    "infra_step": true,
+    "name": "install runtimes (3).install xcode.install xcode from cipd",
+    "timeout": 1800,
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "killall",
       "-9",
diff --git a/recipe_modules/osx_sdk/examples/full.expected/xcode_install_fails_passes_on_retry.json b/recipe_modules/osx_sdk/examples/full.expected/xcode_install_fails_passes_on_retry.json
index c02a99a..144e264 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/xcode_install_fails_passes_on_retry.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/xcode_install_fails_passes_on_retry.json
@@ -1,6 +1,13 @@
 [
   {
     "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "name": "find macOS version"
+  },
+  {
+    "cmd": [
       "echo",
       "[CACHE]/osx_sdk/xcode_deadbeef"
     ],
diff --git a/recipe_modules/osx_sdk/examples/full.py b/recipe_modules/osx_sdk/examples/full.py
index fd125ee..849fd25 100644
--- a/recipe_modules/osx_sdk/examples/full.py
+++ b/recipe_modules/osx_sdk/examples/full.py
@@ -49,6 +49,10 @@
   yield api.test(
       'explicit_runtime_version',
       api.platform.name('mac'),
+      api.step_data(
+          "find macOS version",
+          stdout=api.raw_io.output_text("10.15.6"),
+      ),
       api.properties(
           **{
               '$flutter/osx_sdk': {
@@ -86,13 +90,19 @@
   yield api.test(
       'automatic_version',
       api.platform.name('mac'),
-      api.platform.mac_release('10.15.6'),
+      api.step_data(
+          "find macOS version",
+          stdout=api.raw_io.output_text("10.15.6"),
+      ),
   )
 
   yield api.test(
       'ancient_version',
       api.platform.name('mac'),
-      api.platform.mac_release('10.1.0'),
+      api.step_data(
+          "find macOS version",
+          stdout=api.raw_io.output_text("10.1.0"),
+      ),
   )
 
   yield api.test(
@@ -112,7 +122,10 @@
   yield api.test(
       'explicit_invalid_runtime_version_with_mac_13',
       api.platform.name('mac'),
-      api.platform.mac_release('13.5.1'),
+      api.step_data(
+          "find macOS version",
+          stdout=api.raw_io.output_text("13.5.1"),
+      ),
       api.properties(
           **{
               '$flutter/osx_sdk': {
@@ -127,7 +140,10 @@
   yield api.test(
       'mac_13_explicit_runtime_version_already_mounted',
       api.platform.name('mac'),
-      api.platform.mac_release('13.5.1'),
+      api.step_data(
+          "find macOS version",
+          stdout=api.raw_io.output_text("13.5.1"),
+      ),
       api.properties(
           **{
               '$flutter/osx_sdk': {
@@ -188,7 +204,10 @@
   yield api.test(
       'mac_13_explicit_runtime_version_not_mounted',
       api.platform.name('mac'),
-      api.platform.mac_release('13.5.1'),
+      api.step_data(
+          "find macOS version",
+          stdout=api.raw_io.output_text("13.5.1"),
+      ),
       api.properties(
           **{
               '$flutter/osx_sdk': {
@@ -246,7 +265,10 @@
   yield api.test(
       'mac_13_explicit_runtime_version_build_verion_failure',
       api.platform.name('mac'),
-      api.platform.mac_release('13.5.1'),
+      api.step_data(
+          "find macOS version",
+          stdout=api.raw_io.output_text("13.5.1"),
+      ),
       api.properties(
           **{
               '$flutter/osx_sdk': {
@@ -292,7 +314,10 @@
   yield api.test(
       'mac_13_explicit_runtime_version_fails_to_find_dmg',
       api.platform.name('mac'),
-      api.platform.mac_release('13.5.1'),
+      api.step_data(
+          "find macOS version",
+          stdout=api.raw_io.output_text("13.5.1"),
+      ),
       api.properties(
           **{
               '$flutter/osx_sdk': {
@@ -317,7 +342,10 @@
   yield api.test(
       'mac_13_explicit_runtime_version_clean',
       api.platform.name('mac'),
-      api.platform.mac_release('13.5.1'),
+      api.step_data(
+          "find macOS version",
+          stdout=api.raw_io.output_text("13.5.1"),
+      ),
       api.properties(
           **{
               '$flutter/osx_sdk': {
@@ -335,10 +363,8 @@
       ),
       api.step_data(
           'Cleaning up runtimes cache.check xcode version',
-          stdout=api.raw_io.output_text(
-              'Xcode 15.0\n' +
-              'Build version 15C500b'
-          )
+          stdout=api.raw_io
+          .output_text('Xcode 15.0\n' + 'Build version 15C500b')
       ),
       api.step_data(
           'Cleaning up runtimes cache.list runtimes',
@@ -397,7 +423,10 @@
   yield api.test(
       'failed_to_delete_runtimes_err_in_stdout',
       api.platform.name('mac'),
-      api.platform.mac_release('13.5.1'),
+      api.step_data(
+          "find macOS version",
+          stdout=api.raw_io.output_text("13.5.1"),
+      ),
       api.properties(
           **{
               '$flutter/osx_sdk': {
@@ -417,7 +446,11 @@
   yield api.test(
       'failed_to_delete_runtimes_err_in_stderr',
       api.platform.name('mac'),
-      api.platform.mac_release('13.5.1'),
+      #api.platform.mac_release('13.5.1'),
+      api.step_data(
+          "find macOS version",
+          stdout=api.raw_io.output_text("13.5.1"),
+      ),
       api.properties(
           **{
               '$flutter/osx_sdk': {
@@ -437,7 +470,10 @@
   yield api.test(
       'mac_13_cleanup_no_runtimes',
       api.platform.name('mac'),
-      api.platform.mac_release('13.5.1'),
+      api.step_data(
+          "find macOS version",
+          stdout=api.raw_io.output_text("13.5.1"),
+      ),
       api.properties(
           **{
               '$flutter/osx_sdk': {
@@ -452,7 +488,10 @@
   yield api.test(
       'mac_13_arm_host',
       api.platform.name('mac'),
-      api.platform.mac_release('13.5.1'),
+      api.step_data(
+          "find macOS version",
+          stdout=api.raw_io.output_text("13.5.1"),
+      ),
       api.platform.arch('arm'),
       api.properties(
           **{
@@ -467,7 +506,10 @@
   yield api.test(
       'mac_13_x86_host',
       api.platform.name('mac'),
-      api.platform.mac_release('13.5.1'),
+      api.step_data(
+          "find macOS version",
+          stdout=api.raw_io.output_text("13.5.1"),
+      ),
       api.platform.arch('intel'),
       api.properties(
           **{
@@ -482,7 +524,10 @@
   yield api.test(
       'xcode_install_fails_passes_on_retry',
       api.platform.name('mac'),
-      api.platform.mac_release('13.5.1'),
+      api.step_data(
+          "find macOS version",
+          stdout=api.raw_io.output_text("13.5.1"),
+      ),
       api.properties(**{'$flutter/osx_sdk': {'sdk_version': 'deadbeef',}}),
       api.path.exists(sdk_app_path),
       api.step_data(
diff --git a/recipe_modules/recipe_testing/tests/full.expected/recipes_with_buildbucket.json b/recipe_modules/recipe_testing/tests/full.expected/recipes_with_buildbucket.json
index 81802b7..2c88e73 100644
--- a/recipe_modules/recipe_testing/tests/full.expected/recipes_with_buildbucket.json
+++ b/recipe_modules/recipe_testing/tests/full.expected/recipes_with_buildbucket.json
@@ -326,7 +326,7 @@
       }
     },
     "name": "launch builds.schedule",
-    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"foo.bar-debug\", \"project\": \"fuchsia\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"project\": \"fuchsia\", \"ref\": \"refs/heads/main\"}, \"properties\": {\"$flutter/recipe_testing\": {\"enabled\": true, \"recipe_depth\": 1.0}, \"$recipe_engine/buildbucket\": {\"build\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"builder\", \"project\": \"fuchsia\"}, \"createTime\": \"2018-05-25T23:50:17Z\", \"createdBy\": \"user:luci-scheduler@appspot.gserviceaccount.com\", \"executionTimeout\": \"36000s\", \"id\": \"8945511751514863184\", \"infra\": {\"resultdb\": {\"invocation\": \"invocations/build:8945511751514863184\"}, \"swarming\": {\"priority\": 30.0}}, \"input\": {\"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"project\": \"fuchsia\", \"ref\": \"refs/heads/main\"}}}}}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"skip-retry-in-gerrit\", \"value\": \"subbuild\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"foo.bar-debug\", \"project\": \"fuchsia\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"project\": \"fuchsia\", \"ref\": \"refs/heads/main\"}, \"properties\": {\"$flutter/recipe_testing\": {\"enabled\": true, \"recipe_depth\": 1.0}, \"$recipe_engine/buildbucket\": {\"build\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"builder\", \"project\": \"fuchsia\"}, \"createTime\": \"2018-05-25T23:50:17Z\", \"createdBy\": \"user:luci-scheduler@appspot.gserviceaccount.com\", \"executionTimeout\": \"36000s\", \"id\": \"8945511751514863184\", \"infra\": {\"backend\": {\"config\": {\"priority\": 30.0}, \"task\": {\"id\": {\"target\": \"swarming://chromium-swarm\"}}}, \"resultdb\": {\"invocation\": \"invocations/build:8945511751514863184\"}}, \"input\": {\"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"project\": \"fuchsia\", \"ref\": \"refs/heads/main\"}}}}}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"skip-retry-in-gerrit\", \"value\": \"subbuild\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -381,11 +381,18 @@
       "@@@STEP_LOG_LINE@request@              \"executionTimeout\": \"36000s\",@@@",
       "@@@STEP_LOG_LINE@request@              \"id\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@request@              \"infra\": {@@@",
+      "@@@STEP_LOG_LINE@request@                \"backend\": {@@@",
+      "@@@STEP_LOG_LINE@request@                  \"config\": {@@@",
+      "@@@STEP_LOG_LINE@request@                    \"priority\": 30.0@@@",
+      "@@@STEP_LOG_LINE@request@                  },@@@",
+      "@@@STEP_LOG_LINE@request@                  \"task\": {@@@",
+      "@@@STEP_LOG_LINE@request@                    \"id\": {@@@",
+      "@@@STEP_LOG_LINE@request@                      \"target\": \"swarming://chromium-swarm\"@@@",
+      "@@@STEP_LOG_LINE@request@                    }@@@",
+      "@@@STEP_LOG_LINE@request@                  }@@@",
+      "@@@STEP_LOG_LINE@request@                },@@@",
       "@@@STEP_LOG_LINE@request@                \"resultdb\": {@@@",
       "@@@STEP_LOG_LINE@request@                  \"invocation\": \"invocations/build:8945511751514863184\"@@@",
-      "@@@STEP_LOG_LINE@request@                },@@@",
-      "@@@STEP_LOG_LINE@request@                \"swarming\": {@@@",
-      "@@@STEP_LOG_LINE@request@                  \"priority\": 30.0@@@",
       "@@@STEP_LOG_LINE@request@                }@@@",
       "@@@STEP_LOG_LINE@request@              },@@@",
       "@@@STEP_LOG_LINE@request@              \"input\": {@@@",
diff --git a/recipe_modules/recipe_testing/tests/full.expected/with_buildbucket.json b/recipe_modules/recipe_testing/tests/full.expected/with_buildbucket.json
index 6004aae..0d42fc9 100644
--- a/recipe_modules/recipe_testing/tests/full.expected/with_buildbucket.json
+++ b/recipe_modules/recipe_testing/tests/full.expected/with_buildbucket.json
@@ -459,7 +459,7 @@
       }
     },
     "name": "launch builds.schedule",
-    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"core.arm64-debug\", \"project\": \"fuchsia\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"project\": \"fuchsia\", \"ref\": \"refs/heads/main\"}, \"properties\": {\"$flutter/recipe_testing\": {\"enabled\": true, \"recipe_depth\": 1.0}, \"$recipe_engine/buildbucket\": {\"build\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"builder\", \"project\": \"fuchsia\"}, \"createTime\": \"2018-05-25T23:50:17Z\", \"createdBy\": \"user:luci-scheduler@appspot.gserviceaccount.com\", \"executionTimeout\": \"36000s\", \"id\": \"8945511751514863184\", \"infra\": {\"resultdb\": {\"invocation\": \"invocations/build:8945511751514863184\"}, \"swarming\": {\"priority\": 30.0}}, \"input\": {\"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"project\": \"fuchsia\", \"ref\": \"refs/heads/main\"}}}}}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"skip-retry-in-gerrit\", \"value\": \"subbuild\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"core.x64-debug\", \"project\": \"fuchsia\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"project\": \"fuchsia\", \"ref\": \"refs/heads/main\"}, \"properties\": {\"$flutter/recipe_testing\": {\"enabled\": true, \"recipe_depth\": 1.0}, \"$recipe_engine/buildbucket\": {\"build\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"builder\", \"project\": \"fuchsia\"}, \"createTime\": \"2018-05-25T23:50:17Z\", \"createdBy\": \"user:luci-scheduler@appspot.gserviceaccount.com\", \"executionTimeout\": \"36000s\", \"id\": \"8945511751514863184\", \"infra\": {\"resultdb\": {\"invocation\": \"invocations/build:8945511751514863184\"}, \"swarming\": {\"priority\": 30.0}}, \"input\": {\"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"project\": \"fuchsia\", \"ref\": \"refs/heads/main\"}}}}}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"skip-retry-in-gerrit\", \"value\": \"subbuild\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"core.arm64-debug\", \"project\": \"fuchsia\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"project\": \"fuchsia\", \"ref\": \"refs/heads/main\"}, \"properties\": {\"$flutter/recipe_testing\": {\"enabled\": true, \"recipe_depth\": 1.0}, \"$recipe_engine/buildbucket\": {\"build\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"builder\", \"project\": \"fuchsia\"}, \"createTime\": \"2018-05-25T23:50:17Z\", \"createdBy\": \"user:luci-scheduler@appspot.gserviceaccount.com\", \"executionTimeout\": \"36000s\", \"id\": \"8945511751514863184\", \"infra\": {\"backend\": {\"config\": {\"priority\": 30.0}, \"task\": {\"id\": {\"target\": \"swarming://chromium-swarm\"}}}, \"resultdb\": {\"invocation\": \"invocations/build:8945511751514863184\"}}, \"input\": {\"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"project\": \"fuchsia\", \"ref\": \"refs/heads/main\"}}}}}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"skip-retry-in-gerrit\", \"value\": \"subbuild\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"core.x64-debug\", \"project\": \"fuchsia\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"project\": \"fuchsia\", \"ref\": \"refs/heads/main\"}, \"properties\": {\"$flutter/recipe_testing\": {\"enabled\": true, \"recipe_depth\": 1.0}, \"$recipe_engine/buildbucket\": {\"build\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"builder\", \"project\": \"fuchsia\"}, \"createTime\": \"2018-05-25T23:50:17Z\", \"createdBy\": \"user:luci-scheduler@appspot.gserviceaccount.com\", \"executionTimeout\": \"36000s\", \"id\": \"8945511751514863184\", \"infra\": {\"backend\": {\"config\": {\"priority\": 30.0}, \"task\": {\"id\": {\"target\": \"swarming://chromium-swarm\"}}}, \"resultdb\": {\"invocation\": \"invocations/build:8945511751514863184\"}}, \"input\": {\"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"project\": \"fuchsia\", \"ref\": \"refs/heads/main\"}}}}}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"skip-retry-in-gerrit\", \"value\": \"subbuild\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -524,11 +524,18 @@
       "@@@STEP_LOG_LINE@request@              \"executionTimeout\": \"36000s\",@@@",
       "@@@STEP_LOG_LINE@request@              \"id\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@request@              \"infra\": {@@@",
+      "@@@STEP_LOG_LINE@request@                \"backend\": {@@@",
+      "@@@STEP_LOG_LINE@request@                  \"config\": {@@@",
+      "@@@STEP_LOG_LINE@request@                    \"priority\": 30.0@@@",
+      "@@@STEP_LOG_LINE@request@                  },@@@",
+      "@@@STEP_LOG_LINE@request@                  \"task\": {@@@",
+      "@@@STEP_LOG_LINE@request@                    \"id\": {@@@",
+      "@@@STEP_LOG_LINE@request@                      \"target\": \"swarming://chromium-swarm\"@@@",
+      "@@@STEP_LOG_LINE@request@                    }@@@",
+      "@@@STEP_LOG_LINE@request@                  }@@@",
+      "@@@STEP_LOG_LINE@request@                },@@@",
       "@@@STEP_LOG_LINE@request@                \"resultdb\": {@@@",
       "@@@STEP_LOG_LINE@request@                  \"invocation\": \"invocations/build:8945511751514863184\"@@@",
-      "@@@STEP_LOG_LINE@request@                },@@@",
-      "@@@STEP_LOG_LINE@request@                \"swarming\": {@@@",
-      "@@@STEP_LOG_LINE@request@                  \"priority\": 30.0@@@",
       "@@@STEP_LOG_LINE@request@                }@@@",
       "@@@STEP_LOG_LINE@request@              },@@@",
       "@@@STEP_LOG_LINE@request@              \"input\": {@@@",
@@ -597,11 +604,18 @@
       "@@@STEP_LOG_LINE@request@              \"executionTimeout\": \"36000s\",@@@",
       "@@@STEP_LOG_LINE@request@              \"id\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@request@              \"infra\": {@@@",
+      "@@@STEP_LOG_LINE@request@                \"backend\": {@@@",
+      "@@@STEP_LOG_LINE@request@                  \"config\": {@@@",
+      "@@@STEP_LOG_LINE@request@                    \"priority\": 30.0@@@",
+      "@@@STEP_LOG_LINE@request@                  },@@@",
+      "@@@STEP_LOG_LINE@request@                  \"task\": {@@@",
+      "@@@STEP_LOG_LINE@request@                    \"id\": {@@@",
+      "@@@STEP_LOG_LINE@request@                      \"target\": \"swarming://chromium-swarm\"@@@",
+      "@@@STEP_LOG_LINE@request@                    }@@@",
+      "@@@STEP_LOG_LINE@request@                  }@@@",
+      "@@@STEP_LOG_LINE@request@                },@@@",
       "@@@STEP_LOG_LINE@request@                \"resultdb\": {@@@",
       "@@@STEP_LOG_LINE@request@                  \"invocation\": \"invocations/build:8945511751514863184\"@@@",
-      "@@@STEP_LOG_LINE@request@                },@@@",
-      "@@@STEP_LOG_LINE@request@                \"swarming\": {@@@",
-      "@@@STEP_LOG_LINE@request@                  \"priority\": 30.0@@@",
       "@@@STEP_LOG_LINE@request@                }@@@",
       "@@@STEP_LOG_LINE@request@              },@@@",
       "@@@STEP_LOG_LINE@request@              \"input\": {@@@",
diff --git a/recipe_modules/signing/api.py b/recipe_modules/signing/api.py
index 18727b5..b4e4137 100644
--- a/recipe_modules/signing/api.py
+++ b/recipe_modules/signing/api.py
@@ -2,7 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-#import zipfile
 from recipe_engine import recipe_api
 
 # File name inside artifacts that require signing with entitlements.
diff --git a/recipe_modules/signing/examples/code_sign.expected/mac_require_signing.json b/recipe_modules/signing/examples/code_sign.expected/mac_require_signing.json
index e8b23ad..85b5b6b 100644
--- a/recipe_modules/signing/examples/code_sign.expected/mac_require_signing.json
+++ b/recipe_modules/signing/examples/code_sign.expected/mac_require_signing.json
@@ -1,5 +1,12 @@
 [
   {
+    "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "name": "find macOS version"
+  },
+  {
     "cmd": [],
     "name": "Codesign Dependencies"
   },
diff --git a/recipe_modules/signing/examples/code_sign.expected/no_signing_identity.json b/recipe_modules/signing/examples/code_sign.expected/no_signing_identity.json
index e8b23ad..85b5b6b 100644
--- a/recipe_modules/signing/examples/code_sign.expected/no_signing_identity.json
+++ b/recipe_modules/signing/examples/code_sign.expected/no_signing_identity.json
@@ -1,5 +1,12 @@
 [
   {
+    "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "name": "find macOS version"
+  },
+  {
     "cmd": [],
     "name": "Codesign Dependencies"
   },
diff --git a/recipe_modules/signing/examples/requires_signing.expected/mac_does_not_require_signing.json b/recipe_modules/signing/examples/requires_signing.expected/mac_does_not_require_signing.json
index 02e3920..cce5c3a 100644
--- a/recipe_modules/signing/examples/requires_signing.expected/mac_does_not_require_signing.json
+++ b/recipe_modules/signing/examples/requires_signing.expected/mac_does_not_require_signing.json
@@ -1,5 +1,12 @@
 [
   {
+    "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "name": "find macOS version"
+  },
+  {
     "cmd": [],
     "name": "Create test file"
   },
diff --git a/recipe_modules/signing/examples/requires_signing.expected/mac_require_signing_entitlements.json b/recipe_modules/signing/examples/requires_signing.expected/mac_require_signing_entitlements.json
index 2ce6b86..f93b999 100644
--- a/recipe_modules/signing/examples/requires_signing.expected/mac_require_signing_entitlements.json
+++ b/recipe_modules/signing/examples/requires_signing.expected/mac_require_signing_entitlements.json
@@ -1,5 +1,12 @@
 [
   {
+    "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "name": "find macOS version"
+  },
+  {
     "cmd": [],
     "name": "Create test file"
   },
diff --git a/recipe_modules/signing/examples/requires_signing.expected/mac_require_signing_without_entitlements.json b/recipe_modules/signing/examples/requires_signing.expected/mac_require_signing_without_entitlements.json
index f522c04..2d5483f 100644
--- a/recipe_modules/signing/examples/requires_signing.expected/mac_require_signing_without_entitlements.json
+++ b/recipe_modules/signing/examples/requires_signing.expected/mac_require_signing_without_entitlements.json
@@ -1,5 +1,12 @@
 [
   {
+    "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "name": "find macOS version"
+  },
+  {
     "cmd": [],
     "name": "Create test file"
   },
diff --git a/recipe_modules/subbuild/tests/full.expected/failed_subbuild.json b/recipe_modules/subbuild/tests/full.expected/failed_subbuild.json
index bb3cfbb..616cb5a 100644
--- a/recipe_modules/subbuild/tests/full.expected/failed_subbuild.json
+++ b/recipe_modules/subbuild/tests/full.expected/failed_subbuild.json
@@ -27,7 +27,7 @@
       }
     },
     "name": "launch builds.schedule",
-    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"builder-subbuild1\", \"project\": \"fuchsia\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"fuchsia-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"fuchsia\"}], \"properties\": {\"$recipe_engine/buildbucket\": {\"build\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"builder\", \"project\": \"fuchsia\"}, \"createTime\": \"2018-05-25T23:50:17Z\", \"createdBy\": \"project:fuchsia\", \"executionTimeout\": \"36000s\", \"id\": \"8945511751514863184\", \"infra\": {\"resultdb\": {\"invocation\": \"invocations/build:8945511751514863184\"}, \"swarming\": {\"priority\": 30.0}}, \"input\": {\"gerritChanges\": [{\"change\": \"123456\", \"host\": \"fuchsia-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"fuchsia\"}]}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}]}}, \"integration_base_revision\": \"abc123\", \"parent_id\": \"parentid\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"hide-in-gerrit\", \"value\": \"subbuild\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"skip-retry-in-gerrit\", \"value\": \"subbuild\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"builder-subbuild2\", \"project\": \"fuchsia\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"fuchsia-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"fuchsia\"}], \"properties\": {\"$recipe_engine/buildbucket\": {\"build\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"builder\", \"project\": \"fuchsia\"}, \"createTime\": \"2018-05-25T23:50:17Z\", \"createdBy\": \"project:fuchsia\", \"executionTimeout\": \"36000s\", \"id\": \"8945511751514863184\", \"infra\": {\"resultdb\": {\"invocation\": \"invocations/build:8945511751514863184\"}, \"swarming\": {\"priority\": 30.0}}, \"input\": {\"gerritChanges\": [{\"change\": \"123456\", \"host\": \"fuchsia-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"fuchsia\"}]}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}]}}, \"integration_base_revision\": \"abc123\", \"parent_id\": \"parentid\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"hide-in-gerrit\", \"value\": \"subbuild\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"skip-retry-in-gerrit\", \"value\": \"subbuild\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"builder-subbuild1\", \"project\": \"fuchsia\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"fuchsia-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"fuchsia\"}], \"properties\": {\"$recipe_engine/buildbucket\": {\"build\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"builder\", \"project\": \"fuchsia\"}, \"createTime\": \"2018-05-25T23:50:17Z\", \"createdBy\": \"project:fuchsia\", \"executionTimeout\": \"36000s\", \"id\": \"8945511751514863184\", \"infra\": {\"backend\": {\"config\": {\"priority\": 30.0}, \"task\": {\"id\": {\"target\": \"swarming://chromium-swarm\"}}}, \"resultdb\": {\"invocation\": \"invocations/build:8945511751514863184\"}}, \"input\": {\"gerritChanges\": [{\"change\": \"123456\", \"host\": \"fuchsia-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"fuchsia\"}]}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}]}}, \"integration_base_revision\": \"abc123\", \"parent_id\": \"parentid\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"hide-in-gerrit\", \"value\": \"subbuild\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"skip-retry-in-gerrit\", \"value\": \"subbuild\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"builder-subbuild2\", \"project\": \"fuchsia\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"fuchsia-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"fuchsia\"}], \"properties\": {\"$recipe_engine/buildbucket\": {\"build\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"builder\", \"project\": \"fuchsia\"}, \"createTime\": \"2018-05-25T23:50:17Z\", \"createdBy\": \"project:fuchsia\", \"executionTimeout\": \"36000s\", \"id\": \"8945511751514863184\", \"infra\": {\"backend\": {\"config\": {\"priority\": 30.0}, \"task\": {\"id\": {\"target\": \"swarming://chromium-swarm\"}}}, \"resultdb\": {\"invocation\": \"invocations/build:8945511751514863184\"}}, \"input\": {\"gerritChanges\": [{\"change\": \"123456\", \"host\": \"fuchsia-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"fuchsia\"}]}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}]}}, \"integration_base_revision\": \"abc123\", \"parent_id\": \"parentid\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"hide-in-gerrit\", \"value\": \"subbuild\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"skip-retry-in-gerrit\", \"value\": \"subbuild\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -80,11 +80,18 @@
       "@@@STEP_LOG_LINE@request@              \"executionTimeout\": \"36000s\",@@@",
       "@@@STEP_LOG_LINE@request@              \"id\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@request@              \"infra\": {@@@",
+      "@@@STEP_LOG_LINE@request@                \"backend\": {@@@",
+      "@@@STEP_LOG_LINE@request@                  \"config\": {@@@",
+      "@@@STEP_LOG_LINE@request@                    \"priority\": 30.0@@@",
+      "@@@STEP_LOG_LINE@request@                  },@@@",
+      "@@@STEP_LOG_LINE@request@                  \"task\": {@@@",
+      "@@@STEP_LOG_LINE@request@                    \"id\": {@@@",
+      "@@@STEP_LOG_LINE@request@                      \"target\": \"swarming://chromium-swarm\"@@@",
+      "@@@STEP_LOG_LINE@request@                    }@@@",
+      "@@@STEP_LOG_LINE@request@                  }@@@",
+      "@@@STEP_LOG_LINE@request@                },@@@",
       "@@@STEP_LOG_LINE@request@                \"resultdb\": {@@@",
       "@@@STEP_LOG_LINE@request@                  \"invocation\": \"invocations/build:8945511751514863184\"@@@",
-      "@@@STEP_LOG_LINE@request@                },@@@",
-      "@@@STEP_LOG_LINE@request@                \"swarming\": {@@@",
-      "@@@STEP_LOG_LINE@request@                  \"priority\": 30.0@@@",
       "@@@STEP_LOG_LINE@request@                }@@@",
       "@@@STEP_LOG_LINE@request@              },@@@",
       "@@@STEP_LOG_LINE@request@              \"input\": {@@@",
@@ -169,11 +176,18 @@
       "@@@STEP_LOG_LINE@request@              \"executionTimeout\": \"36000s\",@@@",
       "@@@STEP_LOG_LINE@request@              \"id\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@request@              \"infra\": {@@@",
+      "@@@STEP_LOG_LINE@request@                \"backend\": {@@@",
+      "@@@STEP_LOG_LINE@request@                  \"config\": {@@@",
+      "@@@STEP_LOG_LINE@request@                    \"priority\": 30.0@@@",
+      "@@@STEP_LOG_LINE@request@                  },@@@",
+      "@@@STEP_LOG_LINE@request@                  \"task\": {@@@",
+      "@@@STEP_LOG_LINE@request@                    \"id\": {@@@",
+      "@@@STEP_LOG_LINE@request@                      \"target\": \"swarming://chromium-swarm\"@@@",
+      "@@@STEP_LOG_LINE@request@                    }@@@",
+      "@@@STEP_LOG_LINE@request@                  }@@@",
+      "@@@STEP_LOG_LINE@request@                },@@@",
       "@@@STEP_LOG_LINE@request@                \"resultdb\": {@@@",
       "@@@STEP_LOG_LINE@request@                  \"invocation\": \"invocations/build:8945511751514863184\"@@@",
-      "@@@STEP_LOG_LINE@request@                },@@@",
-      "@@@STEP_LOG_LINE@request@                \"swarming\": {@@@",
-      "@@@STEP_LOG_LINE@request@                  \"priority\": 30.0@@@",
       "@@@STEP_LOG_LINE@request@                }@@@",
       "@@@STEP_LOG_LINE@request@              },@@@",
       "@@@STEP_LOG_LINE@request@              \"input\": {@@@",
diff --git a/recipe_modules/subbuild/tests/full.expected/launch_builds_ci.json b/recipe_modules/subbuild/tests/full.expected/launch_builds_ci.json
index 5a7051b..fc4aa25 100644
--- a/recipe_modules/subbuild/tests/full.expected/launch_builds_ci.json
+++ b/recipe_modules/subbuild/tests/full.expected/launch_builds_ci.json
@@ -28,7 +28,7 @@
       }
     },
     "name": "launch builds.schedule",
-    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"builder-subbuild1\", \"project\": \"fuchsia\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"project\": \"fuchsia\", \"ref\": \"refs/heads/main\"}, \"properties\": {\"$recipe_engine/buildbucket\": {\"build\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"builder\", \"project\": \"fuchsia\"}, \"createTime\": \"2018-05-25T23:50:17Z\", \"createdBy\": \"user:luci-scheduler@appspot.gserviceaccount.com\", \"executionTimeout\": \"36000s\", \"id\": \"8945511751514863184\", \"infra\": {\"resultdb\": {\"invocation\": \"invocations/build:8945511751514863184\"}, \"swarming\": {\"priority\": 30.0}}, \"input\": {\"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"project\": \"fuchsia\", \"ref\": \"refs/heads/main\"}}}}, \"integration_base_revision\": \"abc123\", \"parent_id\": \"parentid\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"hide-in-gerrit\", \"value\": \"subbuild\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"skip-retry-in-gerrit\", \"value\": \"subbuild\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"builder-subbuild2\", \"project\": \"fuchsia\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"project\": \"fuchsia\", \"ref\": \"refs/heads/main\"}, \"properties\": {\"$recipe_engine/buildbucket\": {\"build\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"builder\", \"project\": \"fuchsia\"}, \"createTime\": \"2018-05-25T23:50:17Z\", \"createdBy\": \"user:luci-scheduler@appspot.gserviceaccount.com\", \"executionTimeout\": \"36000s\", \"id\": \"8945511751514863184\", \"infra\": {\"resultdb\": {\"invocation\": \"invocations/build:8945511751514863184\"}, \"swarming\": {\"priority\": 30.0}}, \"input\": {\"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"project\": \"fuchsia\", \"ref\": \"refs/heads/main\"}}}}, \"integration_base_revision\": \"abc123\", \"parent_id\": \"parentid\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"hide-in-gerrit\", \"value\": \"subbuild\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"skip-retry-in-gerrit\", \"value\": \"subbuild\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"builder-subbuild1\", \"project\": \"fuchsia\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"project\": \"fuchsia\", \"ref\": \"refs/heads/main\"}, \"properties\": {\"$recipe_engine/buildbucket\": {\"build\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"builder\", \"project\": \"fuchsia\"}, \"createTime\": \"2018-05-25T23:50:17Z\", \"createdBy\": \"user:luci-scheduler@appspot.gserviceaccount.com\", \"executionTimeout\": \"36000s\", \"id\": \"8945511751514863184\", \"infra\": {\"backend\": {\"config\": {\"priority\": 30.0}, \"task\": {\"id\": {\"target\": \"swarming://chromium-swarm\"}}}, \"resultdb\": {\"invocation\": \"invocations/build:8945511751514863184\"}}, \"input\": {\"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"project\": \"fuchsia\", \"ref\": \"refs/heads/main\"}}}}, \"integration_base_revision\": \"abc123\", \"parent_id\": \"parentid\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"hide-in-gerrit\", \"value\": \"subbuild\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"skip-retry-in-gerrit\", \"value\": \"subbuild\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"builder-subbuild2\", \"project\": \"fuchsia\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"project\": \"fuchsia\", \"ref\": \"refs/heads/main\"}, \"properties\": {\"$recipe_engine/buildbucket\": {\"build\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"builder\", \"project\": \"fuchsia\"}, \"createTime\": \"2018-05-25T23:50:17Z\", \"createdBy\": \"user:luci-scheduler@appspot.gserviceaccount.com\", \"executionTimeout\": \"36000s\", \"id\": \"8945511751514863184\", \"infra\": {\"backend\": {\"config\": {\"priority\": 30.0}, \"task\": {\"id\": {\"target\": \"swarming://chromium-swarm\"}}}, \"resultdb\": {\"invocation\": \"invocations/build:8945511751514863184\"}}, \"input\": {\"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"project\": \"fuchsia\", \"ref\": \"refs/heads/main\"}}}}, \"integration_base_revision\": \"abc123\", \"parent_id\": \"parentid\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"hide-in-gerrit\", \"value\": \"subbuild\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"skip-retry-in-gerrit\", \"value\": \"subbuild\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -89,11 +89,18 @@
       "@@@STEP_LOG_LINE@request@              \"executionTimeout\": \"36000s\",@@@",
       "@@@STEP_LOG_LINE@request@              \"id\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@request@              \"infra\": {@@@",
+      "@@@STEP_LOG_LINE@request@                \"backend\": {@@@",
+      "@@@STEP_LOG_LINE@request@                  \"config\": {@@@",
+      "@@@STEP_LOG_LINE@request@                    \"priority\": 30.0@@@",
+      "@@@STEP_LOG_LINE@request@                  },@@@",
+      "@@@STEP_LOG_LINE@request@                  \"task\": {@@@",
+      "@@@STEP_LOG_LINE@request@                    \"id\": {@@@",
+      "@@@STEP_LOG_LINE@request@                      \"target\": \"swarming://chromium-swarm\"@@@",
+      "@@@STEP_LOG_LINE@request@                    }@@@",
+      "@@@STEP_LOG_LINE@request@                  }@@@",
+      "@@@STEP_LOG_LINE@request@                },@@@",
       "@@@STEP_LOG_LINE@request@                \"resultdb\": {@@@",
       "@@@STEP_LOG_LINE@request@                  \"invocation\": \"invocations/build:8945511751514863184\"@@@",
-      "@@@STEP_LOG_LINE@request@                },@@@",
-      "@@@STEP_LOG_LINE@request@                \"swarming\": {@@@",
-      "@@@STEP_LOG_LINE@request@                  \"priority\": 30.0@@@",
       "@@@STEP_LOG_LINE@request@                }@@@",
       "@@@STEP_LOG_LINE@request@              },@@@",
       "@@@STEP_LOG_LINE@request@              \"input\": {@@@",
@@ -164,11 +171,18 @@
       "@@@STEP_LOG_LINE@request@              \"executionTimeout\": \"36000s\",@@@",
       "@@@STEP_LOG_LINE@request@              \"id\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@request@              \"infra\": {@@@",
+      "@@@STEP_LOG_LINE@request@                \"backend\": {@@@",
+      "@@@STEP_LOG_LINE@request@                  \"config\": {@@@",
+      "@@@STEP_LOG_LINE@request@                    \"priority\": 30.0@@@",
+      "@@@STEP_LOG_LINE@request@                  },@@@",
+      "@@@STEP_LOG_LINE@request@                  \"task\": {@@@",
+      "@@@STEP_LOG_LINE@request@                    \"id\": {@@@",
+      "@@@STEP_LOG_LINE@request@                      \"target\": \"swarming://chromium-swarm\"@@@",
+      "@@@STEP_LOG_LINE@request@                    }@@@",
+      "@@@STEP_LOG_LINE@request@                  }@@@",
+      "@@@STEP_LOG_LINE@request@                },@@@",
       "@@@STEP_LOG_LINE@request@                \"resultdb\": {@@@",
       "@@@STEP_LOG_LINE@request@                  \"invocation\": \"invocations/build:8945511751514863184\"@@@",
-      "@@@STEP_LOG_LINE@request@                },@@@",
-      "@@@STEP_LOG_LINE@request@                \"swarming\": {@@@",
-      "@@@STEP_LOG_LINE@request@                  \"priority\": 30.0@@@",
       "@@@STEP_LOG_LINE@request@                }@@@",
       "@@@STEP_LOG_LINE@request@              },@@@",
       "@@@STEP_LOG_LINE@request@              \"input\": {@@@",
diff --git a/recipe_modules/subbuild/tests/full.expected/launch_builds_with_led_ci.json b/recipe_modules/subbuild/tests/full.expected/launch_builds_with_led_ci.json
index 6b2fac1..8847648 100644
--- a/recipe_modules/subbuild/tests/full.expected/launch_builds_with_led_ci.json
+++ b/recipe_modules/subbuild/tests/full.expected/launch_builds_with_led_ci.json
@@ -83,7 +83,7 @@
       "led",
       "edit",
       "-p",
-      "$recipe_engine/buildbucket={\"build\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"builder\", \"project\": \"fuchsia\"}, \"createTime\": \"2018-05-25T23:50:17Z\", \"createdBy\": \"user:luci-scheduler@appspot.gserviceaccount.com\", \"executionTimeout\": \"36000s\", \"id\": \"8945511751514863184\", \"infra\": {\"resultdb\": {\"invocation\": \"invocations/build:8945511751514863184\"}, \"swarming\": {\"priority\": 30}}, \"input\": {\"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"project\": \"fuchsia\", \"ref\": \"refs/heads/main\"}}}}",
+      "$recipe_engine/buildbucket={\"build\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"builder\", \"project\": \"fuchsia\"}, \"createTime\": \"2018-05-25T23:50:17Z\", \"createdBy\": \"user:luci-scheduler@appspot.gserviceaccount.com\", \"executionTimeout\": \"36000s\", \"id\": \"8945511751514863184\", \"infra\": {\"backend\": {\"config\": {\"priority\": 30}, \"task\": {\"id\": {\"target\": \"swarming://chromium-swarm\"}}}, \"resultdb\": {\"invocation\": \"invocations/build:8945511751514863184\"}}, \"input\": {\"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"project\": \"fuchsia\", \"ref\": \"refs/heads/main\"}}}}",
       "-p",
       "integration_base_revision=\"abc123\"",
       "-p",
@@ -152,11 +152,18 @@
       "@@@STEP_LOG_LINE@proto.output@                \"executionTimeout\": \"36000s\",@@@",
       "@@@STEP_LOG_LINE@proto.output@                \"id\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@proto.output@                \"infra\": {@@@",
+      "@@@STEP_LOG_LINE@proto.output@                  \"backend\": {@@@",
+      "@@@STEP_LOG_LINE@proto.output@                    \"config\": {@@@",
+      "@@@STEP_LOG_LINE@proto.output@                      \"priority\": 30.0@@@",
+      "@@@STEP_LOG_LINE@proto.output@                    },@@@",
+      "@@@STEP_LOG_LINE@proto.output@                    \"task\": {@@@",
+      "@@@STEP_LOG_LINE@proto.output@                      \"id\": {@@@",
+      "@@@STEP_LOG_LINE@proto.output@                        \"target\": \"swarming://chromium-swarm\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@                      }@@@",
+      "@@@STEP_LOG_LINE@proto.output@                    }@@@",
+      "@@@STEP_LOG_LINE@proto.output@                  },@@@",
       "@@@STEP_LOG_LINE@proto.output@                  \"resultdb\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@                    \"invocation\": \"invocations/build:8945511751514863184\"@@@",
-      "@@@STEP_LOG_LINE@proto.output@                  },@@@",
-      "@@@STEP_LOG_LINE@proto.output@                  \"swarming\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@                    \"priority\": 30.0@@@",
       "@@@STEP_LOG_LINE@proto.output@                  }@@@",
       "@@@STEP_LOG_LINE@proto.output@                },@@@",
       "@@@STEP_LOG_LINE@proto.output@                \"input\": {@@@",
@@ -206,7 +213,7 @@
       }
     },
     "name": "launch builds.led launch",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci\",\n          \"builder\": \"builder-subbuild1\",\n          \"project\": \"fuchsia\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"8945511751514863184\",\n        \"infra\": {\n          \"backend\": {\n            \"task\": {\n              \"id\": {\n                \"id\": \"abc123\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 30\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"fuchsia\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/buildbucket\": {\n              \"build\": {\n                \"builder\": {\n                  \"bucket\": \"ci\",\n                  \"builder\": \"builder\",\n                  \"project\": \"fuchsia\"\n                },\n                \"createTime\": \"2018-05-25T23:50:17Z\",\n                \"createdBy\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n                \"executionTimeout\": \"36000s\",\n                \"id\": \"8945511751514863184\",\n                \"infra\": {\n                  \"resultdb\": {\n                    \"invocation\": \"invocations/build:8945511751514863184\"\n                  },\n                  \"swarming\": {\n                    \"priority\": 30.0\n                  }\n                },\n                \"input\": {\n                  \"gitilesCommit\": {\n                    \"host\": \"fuchsia.googlesource.com\",\n                    \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n                    \"project\": \"fuchsia\",\n                    \"ref\": \"refs/heads/main\"\n                  }\n                }\n              }\n            },\n            \"integration_base_revision\": \"abc123\",\n            \"parent_id\": \"parentid\"\n          }\n        },\n        \"output\": {\n          \"properties\": {\n            \"test_orchestration_inputs_hash\": \"abc\"\n          }\n        },\n        \"status\": \"SUCCESS\"\n      }\n    }\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci\",\n          \"builder\": \"builder-subbuild1\",\n          \"project\": \"fuchsia\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"8945511751514863184\",\n        \"infra\": {\n          \"backend\": {\n            \"task\": {\n              \"id\": {\n                \"id\": \"abc123\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 30\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"fuchsia\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/buildbucket\": {\n              \"build\": {\n                \"builder\": {\n                  \"bucket\": \"ci\",\n                  \"builder\": \"builder\",\n                  \"project\": \"fuchsia\"\n                },\n                \"createTime\": \"2018-05-25T23:50:17Z\",\n                \"createdBy\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n                \"executionTimeout\": \"36000s\",\n                \"id\": \"8945511751514863184\",\n                \"infra\": {\n                  \"backend\": {\n                    \"config\": {\n                      \"priority\": 30.0\n                    },\n                    \"task\": {\n                      \"id\": {\n                        \"target\": \"swarming://chromium-swarm\"\n                      }\n                    }\n                  },\n                  \"resultdb\": {\n                    \"invocation\": \"invocations/build:8945511751514863184\"\n                  }\n                },\n                \"input\": {\n                  \"gitilesCommit\": {\n                    \"host\": \"fuchsia.googlesource.com\",\n                    \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n                    \"project\": \"fuchsia\",\n                    \"ref\": \"refs/heads/main\"\n                  }\n                }\n              }\n            },\n            \"integration_base_revision\": \"abc123\",\n            \"parent_id\": \"parentid\"\n          }\n        },\n        \"output\": {\n          \"properties\": {\n            \"test_orchestration_inputs_hash\": \"abc\"\n          }\n        },\n        \"status\": \"SUCCESS\"\n      }\n    }\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -295,7 +302,7 @@
       "led",
       "edit",
       "-p",
-      "$recipe_engine/buildbucket={\"build\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"builder\", \"project\": \"fuchsia\"}, \"createTime\": \"2018-05-25T23:50:17Z\", \"createdBy\": \"user:luci-scheduler@appspot.gserviceaccount.com\", \"executionTimeout\": \"36000s\", \"id\": \"8945511751514863184\", \"infra\": {\"resultdb\": {\"invocation\": \"invocations/build:8945511751514863184\"}, \"swarming\": {\"priority\": 30}}, \"input\": {\"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"project\": \"fuchsia\", \"ref\": \"refs/heads/main\"}}}}",
+      "$recipe_engine/buildbucket={\"build\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"builder\", \"project\": \"fuchsia\"}, \"createTime\": \"2018-05-25T23:50:17Z\", \"createdBy\": \"user:luci-scheduler@appspot.gserviceaccount.com\", \"executionTimeout\": \"36000s\", \"id\": \"8945511751514863184\", \"infra\": {\"backend\": {\"config\": {\"priority\": 30}, \"task\": {\"id\": {\"target\": \"swarming://chromium-swarm\"}}}, \"resultdb\": {\"invocation\": \"invocations/build:8945511751514863184\"}}, \"input\": {\"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"project\": \"fuchsia\", \"ref\": \"refs/heads/main\"}}}}",
       "-p",
       "integration_base_revision=\"abc123\"",
       "-p",
@@ -364,11 +371,18 @@
       "@@@STEP_LOG_LINE@proto.output@                \"executionTimeout\": \"36000s\",@@@",
       "@@@STEP_LOG_LINE@proto.output@                \"id\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@proto.output@                \"infra\": {@@@",
+      "@@@STEP_LOG_LINE@proto.output@                  \"backend\": {@@@",
+      "@@@STEP_LOG_LINE@proto.output@                    \"config\": {@@@",
+      "@@@STEP_LOG_LINE@proto.output@                      \"priority\": 30.0@@@",
+      "@@@STEP_LOG_LINE@proto.output@                    },@@@",
+      "@@@STEP_LOG_LINE@proto.output@                    \"task\": {@@@",
+      "@@@STEP_LOG_LINE@proto.output@                      \"id\": {@@@",
+      "@@@STEP_LOG_LINE@proto.output@                        \"target\": \"swarming://chromium-swarm\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@                      }@@@",
+      "@@@STEP_LOG_LINE@proto.output@                    }@@@",
+      "@@@STEP_LOG_LINE@proto.output@                  },@@@",
       "@@@STEP_LOG_LINE@proto.output@                  \"resultdb\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@                    \"invocation\": \"invocations/build:8945511751514863184\"@@@",
-      "@@@STEP_LOG_LINE@proto.output@                  },@@@",
-      "@@@STEP_LOG_LINE@proto.output@                  \"swarming\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@                    \"priority\": 30.0@@@",
       "@@@STEP_LOG_LINE@proto.output@                  }@@@",
       "@@@STEP_LOG_LINE@proto.output@                },@@@",
       "@@@STEP_LOG_LINE@proto.output@                \"input\": {@@@",
@@ -418,7 +432,7 @@
       }
     },
     "name": "launch builds.led launch (2)",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci\",\n          \"builder\": \"builder-subbuild2\",\n          \"project\": \"fuchsia\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"8945511751514863185\",\n        \"infra\": {\n          \"backend\": {\n            \"task\": {\n              \"id\": {\n                \"id\": \"abc123\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863185\"\n          },\n          \"swarming\": {\n            \"priority\": 30\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"fuchsia\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/buildbucket\": {\n              \"build\": {\n                \"builder\": {\n                  \"bucket\": \"ci\",\n                  \"builder\": \"builder\",\n                  \"project\": \"fuchsia\"\n                },\n                \"createTime\": \"2018-05-25T23:50:17Z\",\n                \"createdBy\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n                \"executionTimeout\": \"36000s\",\n                \"id\": \"8945511751514863184\",\n                \"infra\": {\n                  \"resultdb\": {\n                    \"invocation\": \"invocations/build:8945511751514863184\"\n                  },\n                  \"swarming\": {\n                    \"priority\": 30.0\n                  }\n                },\n                \"input\": {\n                  \"gitilesCommit\": {\n                    \"host\": \"fuchsia.googlesource.com\",\n                    \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n                    \"project\": \"fuchsia\",\n                    \"ref\": \"refs/heads/main\"\n                  }\n                }\n              }\n            },\n            \"integration_base_revision\": \"abc123\",\n            \"parent_id\": \"parentid\"\n          }\n        },\n        \"output\": {\n          \"properties\": {\n            \"test_orchestration_inputs_hash\": \"abc\"\n          }\n        },\n        \"status\": \"SUCCESS\"\n      }\n    }\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"ci\",\n          \"builder\": \"builder-subbuild2\",\n          \"project\": \"fuchsia\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"8945511751514863185\",\n        \"infra\": {\n          \"backend\": {\n            \"task\": {\n              \"id\": {\n                \"id\": \"abc123\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863185\"\n          },\n          \"swarming\": {\n            \"priority\": 30\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"fuchsia\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$recipe_engine/buildbucket\": {\n              \"build\": {\n                \"builder\": {\n                  \"bucket\": \"ci\",\n                  \"builder\": \"builder\",\n                  \"project\": \"fuchsia\"\n                },\n                \"createTime\": \"2018-05-25T23:50:17Z\",\n                \"createdBy\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n                \"executionTimeout\": \"36000s\",\n                \"id\": \"8945511751514863184\",\n                \"infra\": {\n                  \"backend\": {\n                    \"config\": {\n                      \"priority\": 30.0\n                    },\n                    \"task\": {\n                      \"id\": {\n                        \"target\": \"swarming://chromium-swarm\"\n                      }\n                    }\n                  },\n                  \"resultdb\": {\n                    \"invocation\": \"invocations/build:8945511751514863184\"\n                  }\n                },\n                \"input\": {\n                  \"gitilesCommit\": {\n                    \"host\": \"fuchsia.googlesource.com\",\n                    \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n                    \"project\": \"fuchsia\",\n                    \"ref\": \"refs/heads/main\"\n                  }\n                }\n              }\n            },\n            \"integration_base_revision\": \"abc123\",\n            \"parent_id\": \"parentid\"\n          }\n        },\n        \"output\": {\n          \"properties\": {\n            \"test_orchestration_inputs_hash\": \"abc\"\n          }\n        },\n        \"status\": \"SUCCESS\"\n      }\n    }\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
diff --git a/recipe_modules/subbuild/tests/full.expected/launch_builds_with_led_cq.json b/recipe_modules/subbuild/tests/full.expected/launch_builds_with_led_cq.json
index bc941f7..17927c1 100644
--- a/recipe_modules/subbuild/tests/full.expected/launch_builds_with_led_cq.json
+++ b/recipe_modules/subbuild/tests/full.expected/launch_builds_with_led_cq.json
@@ -91,7 +91,7 @@
       "led",
       "edit",
       "-p",
-      "$recipe_engine/buildbucket={\"build\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"builder\", \"project\": \"fuchsia\"}, \"createTime\": \"2018-05-25T23:50:17Z\", \"createdBy\": \"project:fuchsia\", \"executionTimeout\": \"36000s\", \"id\": \"8945511751514863184\", \"infra\": {\"resultdb\": {\"invocation\": \"invocations/build:8945511751514863184\"}, \"swarming\": {\"priority\": 30}}, \"input\": {\"gerritChanges\": [{\"change\": \"123456\", \"host\": \"fuchsia-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"fuchsia\"}]}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}]}}",
+      "$recipe_engine/buildbucket={\"build\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"builder\", \"project\": \"fuchsia\"}, \"createTime\": \"2018-05-25T23:50:17Z\", \"createdBy\": \"project:fuchsia\", \"executionTimeout\": \"36000s\", \"id\": \"8945511751514863184\", \"infra\": {\"backend\": {\"config\": {\"priority\": 30}, \"task\": {\"id\": {\"target\": \"swarming://chromium-swarm\"}}}, \"resultdb\": {\"invocation\": \"invocations/build:8945511751514863184\"}}, \"input\": {\"gerritChanges\": [{\"change\": \"123456\", \"host\": \"fuchsia-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"fuchsia\"}]}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}]}}",
       "-p",
       "integration_base_revision=\"abc123\"",
       "-p",
@@ -162,11 +162,18 @@
       "@@@STEP_LOG_LINE@proto.output@                \"executionTimeout\": \"36000s\",@@@",
       "@@@STEP_LOG_LINE@proto.output@                \"id\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@proto.output@                \"infra\": {@@@",
+      "@@@STEP_LOG_LINE@proto.output@                  \"backend\": {@@@",
+      "@@@STEP_LOG_LINE@proto.output@                    \"config\": {@@@",
+      "@@@STEP_LOG_LINE@proto.output@                      \"priority\": 30.0@@@",
+      "@@@STEP_LOG_LINE@proto.output@                    },@@@",
+      "@@@STEP_LOG_LINE@proto.output@                    \"task\": {@@@",
+      "@@@STEP_LOG_LINE@proto.output@                      \"id\": {@@@",
+      "@@@STEP_LOG_LINE@proto.output@                        \"target\": \"swarming://chromium-swarm\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@                      }@@@",
+      "@@@STEP_LOG_LINE@proto.output@                    }@@@",
+      "@@@STEP_LOG_LINE@proto.output@                  },@@@",
       "@@@STEP_LOG_LINE@proto.output@                  \"resultdb\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@                    \"invocation\": \"invocations/build:8945511751514863184\"@@@",
-      "@@@STEP_LOG_LINE@proto.output@                  },@@@",
-      "@@@STEP_LOG_LINE@proto.output@                  \"swarming\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@                    \"priority\": 30.0@@@",
       "@@@STEP_LOG_LINE@proto.output@                  }@@@",
       "@@@STEP_LOG_LINE@proto.output@                },@@@",
       "@@@STEP_LOG_LINE@proto.output@                \"input\": {@@@",
@@ -229,7 +236,7 @@
       }
     },
     "name": "launch builds.led edit-cr-cl",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"builder-subbuild1\",\n          \"project\": \"fuchsia\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"project:fuchsia\",\n        \"id\": \"8945511751514863186\",\n        \"infra\": {\n          \"backend\": {\n            \"task\": {\n              \"id\": {\n                \"id\": \"abc123\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863186\"\n          },\n          \"swarming\": {\n            \"priority\": 30\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"change\": \"123456\",\n              \"host\": \"chromium-review.googlesource.com\",\n              \"patchset\": \"7\",\n              \"project\": \"fuchsia\"\n            }\n          ],\n          \"properties\": {\n            \"$recipe_engine/buildbucket\": {\n              \"build\": {\n                \"builder\": {\n                  \"bucket\": \"try\",\n                  \"builder\": \"builder\",\n                  \"project\": \"fuchsia\"\n                },\n                \"createTime\": \"2018-05-25T23:50:17Z\",\n                \"createdBy\": \"project:fuchsia\",\n                \"executionTimeout\": \"36000s\",\n                \"id\": \"8945511751514863184\",\n                \"infra\": {\n                  \"resultdb\": {\n                    \"invocation\": \"invocations/build:8945511751514863184\"\n                  },\n                  \"swarming\": {\n                    \"priority\": 30.0\n                  }\n                },\n                \"input\": {\n                  \"gerritChanges\": [\n                    {\n                      \"change\": \"123456\",\n                      \"host\": \"fuchsia-review.googlesource.com\",\n                      \"patchset\": \"7\",\n                      \"project\": \"fuchsia\"\n                    }\n                  ]\n                },\n                \"tags\": [\n                  {\n                    \"key\": \"cq_experimental\",\n                    \"value\": \"false\"\n                  }\n                ]\n              }\n            },\n            \"integration_base_revision\": \"abc123\",\n            \"parent_id\": \"parentid\"\n          }\n        },\n        \"output\": {\n          \"properties\": {\n            \"test_orchestration_inputs_hash\": \"abc\"\n          }\n        },\n        \"status\": \"SUCCESS\",\n        \"tags\": [\n          {\n            \"key\": \"cq_experimental\",\n            \"value\": \"false\"\n          }\n        ]\n      }\n    }\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"builder-subbuild1\",\n          \"project\": \"fuchsia\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"project:fuchsia\",\n        \"id\": \"8945511751514863186\",\n        \"infra\": {\n          \"backend\": {\n            \"task\": {\n              \"id\": {\n                \"id\": \"abc123\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863186\"\n          },\n          \"swarming\": {\n            \"priority\": 30\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"change\": \"123456\",\n              \"host\": \"chromium-review.googlesource.com\",\n              \"patchset\": \"7\",\n              \"project\": \"fuchsia\"\n            }\n          ],\n          \"properties\": {\n            \"$recipe_engine/buildbucket\": {\n              \"build\": {\n                \"builder\": {\n                  \"bucket\": \"try\",\n                  \"builder\": \"builder\",\n                  \"project\": \"fuchsia\"\n                },\n                \"createTime\": \"2018-05-25T23:50:17Z\",\n                \"createdBy\": \"project:fuchsia\",\n                \"executionTimeout\": \"36000s\",\n                \"id\": \"8945511751514863184\",\n                \"infra\": {\n                  \"backend\": {\n                    \"config\": {\n                      \"priority\": 30.0\n                    },\n                    \"task\": {\n                      \"id\": {\n                        \"target\": \"swarming://chromium-swarm\"\n                      }\n                    }\n                  },\n                  \"resultdb\": {\n                    \"invocation\": \"invocations/build:8945511751514863184\"\n                  }\n                },\n                \"input\": {\n                  \"gerritChanges\": [\n                    {\n                      \"change\": \"123456\",\n                      \"host\": \"fuchsia-review.googlesource.com\",\n                      \"patchset\": \"7\",\n                      \"project\": \"fuchsia\"\n                    }\n                  ]\n                },\n                \"tags\": [\n                  {\n                    \"key\": \"cq_experimental\",\n                    \"value\": \"false\"\n                  }\n                ]\n              }\n            },\n            \"integration_base_revision\": \"abc123\",\n            \"parent_id\": \"parentid\"\n          }\n        },\n        \"output\": {\n          \"properties\": {\n            \"test_orchestration_inputs_hash\": \"abc\"\n          }\n        },\n        \"status\": \"SUCCESS\",\n        \"tags\": [\n          {\n            \"key\": \"cq_experimental\",\n            \"value\": \"false\"\n          }\n        ]\n      }\n    }\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -281,11 +288,18 @@
       "@@@STEP_LOG_LINE@proto.output@                \"executionTimeout\": \"36000s\",@@@",
       "@@@STEP_LOG_LINE@proto.output@                \"id\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@proto.output@                \"infra\": {@@@",
+      "@@@STEP_LOG_LINE@proto.output@                  \"backend\": {@@@",
+      "@@@STEP_LOG_LINE@proto.output@                    \"config\": {@@@",
+      "@@@STEP_LOG_LINE@proto.output@                      \"priority\": 30.0@@@",
+      "@@@STEP_LOG_LINE@proto.output@                    },@@@",
+      "@@@STEP_LOG_LINE@proto.output@                    \"task\": {@@@",
+      "@@@STEP_LOG_LINE@proto.output@                      \"id\": {@@@",
+      "@@@STEP_LOG_LINE@proto.output@                        \"target\": \"swarming://chromium-swarm\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@                      }@@@",
+      "@@@STEP_LOG_LINE@proto.output@                    }@@@",
+      "@@@STEP_LOG_LINE@proto.output@                  },@@@",
       "@@@STEP_LOG_LINE@proto.output@                  \"resultdb\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@                    \"invocation\": \"invocations/build:8945511751514863184\"@@@",
-      "@@@STEP_LOG_LINE@proto.output@                  },@@@",
-      "@@@STEP_LOG_LINE@proto.output@                  \"swarming\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@                    \"priority\": 30.0@@@",
       "@@@STEP_LOG_LINE@proto.output@                  }@@@",
       "@@@STEP_LOG_LINE@proto.output@                },@@@",
       "@@@STEP_LOG_LINE@proto.output@                \"input\": {@@@",
@@ -349,7 +363,7 @@
       }
     },
     "name": "launch builds.led launch",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"builder-subbuild1\",\n          \"project\": \"fuchsia\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"project:fuchsia\",\n        \"id\": \"8945511751514863186\",\n        \"infra\": {\n          \"backend\": {\n            \"task\": {\n              \"id\": {\n                \"id\": \"abc123\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863186\"\n          },\n          \"swarming\": {\n            \"priority\": 30\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"change\": \"123456\",\n              \"host\": \"fuchsia-review.googlesource.com\",\n              \"patchset\": \"1337\",\n              \"project\": \"fuchsia\"\n            }\n          ],\n          \"properties\": {\n            \"$recipe_engine/buildbucket\": {\n              \"build\": {\n                \"builder\": {\n                  \"bucket\": \"try\",\n                  \"builder\": \"builder\",\n                  \"project\": \"fuchsia\"\n                },\n                \"createTime\": \"2018-05-25T23:50:17Z\",\n                \"createdBy\": \"project:fuchsia\",\n                \"executionTimeout\": \"36000s\",\n                \"id\": \"8945511751514863184\",\n                \"infra\": {\n                  \"resultdb\": {\n                    \"invocation\": \"invocations/build:8945511751514863184\"\n                  },\n                  \"swarming\": {\n                    \"priority\": 30.0\n                  }\n                },\n                \"input\": {\n                  \"gerritChanges\": [\n                    {\n                      \"change\": \"123456\",\n                      \"host\": \"fuchsia-review.googlesource.com\",\n                      \"patchset\": \"7\",\n                      \"project\": \"fuchsia\"\n                    }\n                  ]\n                },\n                \"tags\": [\n                  {\n                    \"key\": \"cq_experimental\",\n                    \"value\": \"false\"\n                  }\n                ]\n              }\n            },\n            \"integration_base_revision\": \"abc123\",\n            \"parent_id\": \"parentid\"\n          }\n        },\n        \"output\": {\n          \"properties\": {\n            \"test_orchestration_inputs_hash\": \"abc\"\n          }\n        },\n        \"status\": \"SUCCESS\",\n        \"tags\": [\n          {\n            \"key\": \"cq_experimental\",\n            \"value\": \"false\"\n          }\n        ]\n      }\n    }\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"builder-subbuild1\",\n          \"project\": \"fuchsia\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"project:fuchsia\",\n        \"id\": \"8945511751514863186\",\n        \"infra\": {\n          \"backend\": {\n            \"task\": {\n              \"id\": {\n                \"id\": \"abc123\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863186\"\n          },\n          \"swarming\": {\n            \"priority\": 30\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"change\": \"123456\",\n              \"host\": \"fuchsia-review.googlesource.com\",\n              \"patchset\": \"1337\",\n              \"project\": \"fuchsia\"\n            }\n          ],\n          \"properties\": {\n            \"$recipe_engine/buildbucket\": {\n              \"build\": {\n                \"builder\": {\n                  \"bucket\": \"try\",\n                  \"builder\": \"builder\",\n                  \"project\": \"fuchsia\"\n                },\n                \"createTime\": \"2018-05-25T23:50:17Z\",\n                \"createdBy\": \"project:fuchsia\",\n                \"executionTimeout\": \"36000s\",\n                \"id\": \"8945511751514863184\",\n                \"infra\": {\n                  \"backend\": {\n                    \"config\": {\n                      \"priority\": 30.0\n                    },\n                    \"task\": {\n                      \"id\": {\n                        \"target\": \"swarming://chromium-swarm\"\n                      }\n                    }\n                  },\n                  \"resultdb\": {\n                    \"invocation\": \"invocations/build:8945511751514863184\"\n                  }\n                },\n                \"input\": {\n                  \"gerritChanges\": [\n                    {\n                      \"change\": \"123456\",\n                      \"host\": \"fuchsia-review.googlesource.com\",\n                      \"patchset\": \"7\",\n                      \"project\": \"fuchsia\"\n                    }\n                  ]\n                },\n                \"tags\": [\n                  {\n                    \"key\": \"cq_experimental\",\n                    \"value\": \"false\"\n                  }\n                ]\n              }\n            },\n            \"integration_base_revision\": \"abc123\",\n            \"parent_id\": \"parentid\"\n          }\n        },\n        \"output\": {\n          \"properties\": {\n            \"test_orchestration_inputs_hash\": \"abc\"\n          }\n        },\n        \"status\": \"SUCCESS\",\n        \"tags\": [\n          {\n            \"key\": \"cq_experimental\",\n            \"value\": \"false\"\n          }\n        ]\n      }\n    }\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -446,7 +460,7 @@
       "led",
       "edit",
       "-p",
-      "$recipe_engine/buildbucket={\"build\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"builder\", \"project\": \"fuchsia\"}, \"createTime\": \"2018-05-25T23:50:17Z\", \"createdBy\": \"project:fuchsia\", \"executionTimeout\": \"36000s\", \"id\": \"8945511751514863184\", \"infra\": {\"resultdb\": {\"invocation\": \"invocations/build:8945511751514863184\"}, \"swarming\": {\"priority\": 30}}, \"input\": {\"gerritChanges\": [{\"change\": \"123456\", \"host\": \"fuchsia-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"fuchsia\"}]}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}]}}",
+      "$recipe_engine/buildbucket={\"build\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"builder\", \"project\": \"fuchsia\"}, \"createTime\": \"2018-05-25T23:50:17Z\", \"createdBy\": \"project:fuchsia\", \"executionTimeout\": \"36000s\", \"id\": \"8945511751514863184\", \"infra\": {\"backend\": {\"config\": {\"priority\": 30}, \"task\": {\"id\": {\"target\": \"swarming://chromium-swarm\"}}}, \"resultdb\": {\"invocation\": \"invocations/build:8945511751514863184\"}}, \"input\": {\"gerritChanges\": [{\"change\": \"123456\", \"host\": \"fuchsia-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"fuchsia\"}]}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}]}}",
       "-p",
       "integration_base_revision=\"abc123\"",
       "-p",
@@ -517,11 +531,18 @@
       "@@@STEP_LOG_LINE@proto.output@                \"executionTimeout\": \"36000s\",@@@",
       "@@@STEP_LOG_LINE@proto.output@                \"id\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@proto.output@                \"infra\": {@@@",
+      "@@@STEP_LOG_LINE@proto.output@                  \"backend\": {@@@",
+      "@@@STEP_LOG_LINE@proto.output@                    \"config\": {@@@",
+      "@@@STEP_LOG_LINE@proto.output@                      \"priority\": 30.0@@@",
+      "@@@STEP_LOG_LINE@proto.output@                    },@@@",
+      "@@@STEP_LOG_LINE@proto.output@                    \"task\": {@@@",
+      "@@@STEP_LOG_LINE@proto.output@                      \"id\": {@@@",
+      "@@@STEP_LOG_LINE@proto.output@                        \"target\": \"swarming://chromium-swarm\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@                      }@@@",
+      "@@@STEP_LOG_LINE@proto.output@                    }@@@",
+      "@@@STEP_LOG_LINE@proto.output@                  },@@@",
       "@@@STEP_LOG_LINE@proto.output@                  \"resultdb\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@                    \"invocation\": \"invocations/build:8945511751514863184\"@@@",
-      "@@@STEP_LOG_LINE@proto.output@                  },@@@",
-      "@@@STEP_LOG_LINE@proto.output@                  \"swarming\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@                    \"priority\": 30.0@@@",
       "@@@STEP_LOG_LINE@proto.output@                  }@@@",
       "@@@STEP_LOG_LINE@proto.output@                },@@@",
       "@@@STEP_LOG_LINE@proto.output@                \"input\": {@@@",
@@ -584,7 +605,7 @@
       }
     },
     "name": "launch builds.led edit-cr-cl (2)",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"builder-subbuild2\",\n          \"project\": \"fuchsia\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"project:fuchsia\",\n        \"id\": \"8945511751514863187\",\n        \"infra\": {\n          \"backend\": {\n            \"task\": {\n              \"id\": {\n                \"id\": \"abc123\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863187\"\n          },\n          \"swarming\": {\n            \"priority\": 30\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"change\": \"123456\",\n              \"host\": \"chromium-review.googlesource.com\",\n              \"patchset\": \"7\",\n              \"project\": \"fuchsia\"\n            }\n          ],\n          \"properties\": {\n            \"$recipe_engine/buildbucket\": {\n              \"build\": {\n                \"builder\": {\n                  \"bucket\": \"try\",\n                  \"builder\": \"builder\",\n                  \"project\": \"fuchsia\"\n                },\n                \"createTime\": \"2018-05-25T23:50:17Z\",\n                \"createdBy\": \"project:fuchsia\",\n                \"executionTimeout\": \"36000s\",\n                \"id\": \"8945511751514863184\",\n                \"infra\": {\n                  \"resultdb\": {\n                    \"invocation\": \"invocations/build:8945511751514863184\"\n                  },\n                  \"swarming\": {\n                    \"priority\": 30.0\n                  }\n                },\n                \"input\": {\n                  \"gerritChanges\": [\n                    {\n                      \"change\": \"123456\",\n                      \"host\": \"fuchsia-review.googlesource.com\",\n                      \"patchset\": \"7\",\n                      \"project\": \"fuchsia\"\n                    }\n                  ]\n                },\n                \"tags\": [\n                  {\n                    \"key\": \"cq_experimental\",\n                    \"value\": \"false\"\n                  }\n                ]\n              }\n            },\n            \"integration_base_revision\": \"abc123\",\n            \"parent_id\": \"parentid\"\n          }\n        },\n        \"output\": {\n          \"properties\": {\n            \"test_orchestration_inputs_hash\": \"abc\"\n          }\n        },\n        \"status\": \"SUCCESS\",\n        \"tags\": [\n          {\n            \"key\": \"cq_experimental\",\n            \"value\": \"false\"\n          }\n        ]\n      }\n    }\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"builder-subbuild2\",\n          \"project\": \"fuchsia\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"project:fuchsia\",\n        \"id\": \"8945511751514863187\",\n        \"infra\": {\n          \"backend\": {\n            \"task\": {\n              \"id\": {\n                \"id\": \"abc123\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863187\"\n          },\n          \"swarming\": {\n            \"priority\": 30\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"change\": \"123456\",\n              \"host\": \"chromium-review.googlesource.com\",\n              \"patchset\": \"7\",\n              \"project\": \"fuchsia\"\n            }\n          ],\n          \"properties\": {\n            \"$recipe_engine/buildbucket\": {\n              \"build\": {\n                \"builder\": {\n                  \"bucket\": \"try\",\n                  \"builder\": \"builder\",\n                  \"project\": \"fuchsia\"\n                },\n                \"createTime\": \"2018-05-25T23:50:17Z\",\n                \"createdBy\": \"project:fuchsia\",\n                \"executionTimeout\": \"36000s\",\n                \"id\": \"8945511751514863184\",\n                \"infra\": {\n                  \"backend\": {\n                    \"config\": {\n                      \"priority\": 30.0\n                    },\n                    \"task\": {\n                      \"id\": {\n                        \"target\": \"swarming://chromium-swarm\"\n                      }\n                    }\n                  },\n                  \"resultdb\": {\n                    \"invocation\": \"invocations/build:8945511751514863184\"\n                  }\n                },\n                \"input\": {\n                  \"gerritChanges\": [\n                    {\n                      \"change\": \"123456\",\n                      \"host\": \"fuchsia-review.googlesource.com\",\n                      \"patchset\": \"7\",\n                      \"project\": \"fuchsia\"\n                    }\n                  ]\n                },\n                \"tags\": [\n                  {\n                    \"key\": \"cq_experimental\",\n                    \"value\": \"false\"\n                  }\n                ]\n              }\n            },\n            \"integration_base_revision\": \"abc123\",\n            \"parent_id\": \"parentid\"\n          }\n        },\n        \"output\": {\n          \"properties\": {\n            \"test_orchestration_inputs_hash\": \"abc\"\n          }\n        },\n        \"status\": \"SUCCESS\",\n        \"tags\": [\n          {\n            \"key\": \"cq_experimental\",\n            \"value\": \"false\"\n          }\n        ]\n      }\n    }\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -636,11 +657,18 @@
       "@@@STEP_LOG_LINE@proto.output@                \"executionTimeout\": \"36000s\",@@@",
       "@@@STEP_LOG_LINE@proto.output@                \"id\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@proto.output@                \"infra\": {@@@",
+      "@@@STEP_LOG_LINE@proto.output@                  \"backend\": {@@@",
+      "@@@STEP_LOG_LINE@proto.output@                    \"config\": {@@@",
+      "@@@STEP_LOG_LINE@proto.output@                      \"priority\": 30.0@@@",
+      "@@@STEP_LOG_LINE@proto.output@                    },@@@",
+      "@@@STEP_LOG_LINE@proto.output@                    \"task\": {@@@",
+      "@@@STEP_LOG_LINE@proto.output@                      \"id\": {@@@",
+      "@@@STEP_LOG_LINE@proto.output@                        \"target\": \"swarming://chromium-swarm\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@                      }@@@",
+      "@@@STEP_LOG_LINE@proto.output@                    }@@@",
+      "@@@STEP_LOG_LINE@proto.output@                  },@@@",
       "@@@STEP_LOG_LINE@proto.output@                  \"resultdb\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@                    \"invocation\": \"invocations/build:8945511751514863184\"@@@",
-      "@@@STEP_LOG_LINE@proto.output@                  },@@@",
-      "@@@STEP_LOG_LINE@proto.output@                  \"swarming\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@                    \"priority\": 30.0@@@",
       "@@@STEP_LOG_LINE@proto.output@                  }@@@",
       "@@@STEP_LOG_LINE@proto.output@                },@@@",
       "@@@STEP_LOG_LINE@proto.output@                \"input\": {@@@",
@@ -704,7 +732,7 @@
       }
     },
     "name": "launch builds.led launch (2)",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"builder-subbuild2\",\n          \"project\": \"fuchsia\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"project:fuchsia\",\n        \"id\": \"8945511751514863187\",\n        \"infra\": {\n          \"backend\": {\n            \"task\": {\n              \"id\": {\n                \"id\": \"abc123\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863187\"\n          },\n          \"swarming\": {\n            \"priority\": 30\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"change\": \"123456\",\n              \"host\": \"fuchsia-review.googlesource.com\",\n              \"patchset\": \"1337\",\n              \"project\": \"fuchsia\"\n            }\n          ],\n          \"properties\": {\n            \"$recipe_engine/buildbucket\": {\n              \"build\": {\n                \"builder\": {\n                  \"bucket\": \"try\",\n                  \"builder\": \"builder\",\n                  \"project\": \"fuchsia\"\n                },\n                \"createTime\": \"2018-05-25T23:50:17Z\",\n                \"createdBy\": \"project:fuchsia\",\n                \"executionTimeout\": \"36000s\",\n                \"id\": \"8945511751514863184\",\n                \"infra\": {\n                  \"resultdb\": {\n                    \"invocation\": \"invocations/build:8945511751514863184\"\n                  },\n                  \"swarming\": {\n                    \"priority\": 30.0\n                  }\n                },\n                \"input\": {\n                  \"gerritChanges\": [\n                    {\n                      \"change\": \"123456\",\n                      \"host\": \"fuchsia-review.googlesource.com\",\n                      \"patchset\": \"7\",\n                      \"project\": \"fuchsia\"\n                    }\n                  ]\n                },\n                \"tags\": [\n                  {\n                    \"key\": \"cq_experimental\",\n                    \"value\": \"false\"\n                  }\n                ]\n              }\n            },\n            \"integration_base_revision\": \"abc123\",\n            \"parent_id\": \"parentid\"\n          }\n        },\n        \"output\": {\n          \"properties\": {\n            \"test_orchestration_inputs_hash\": \"abc\"\n          }\n        },\n        \"status\": \"SUCCESS\",\n        \"tags\": [\n          {\n            \"key\": \"cq_experimental\",\n            \"value\": \"false\"\n          }\n        ]\n      }\n    }\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"builder-subbuild2\",\n          \"project\": \"fuchsia\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"project:fuchsia\",\n        \"id\": \"8945511751514863187\",\n        \"infra\": {\n          \"backend\": {\n            \"task\": {\n              \"id\": {\n                \"id\": \"abc123\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863187\"\n          },\n          \"swarming\": {\n            \"priority\": 30\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"change\": \"123456\",\n              \"host\": \"fuchsia-review.googlesource.com\",\n              \"patchset\": \"1337\",\n              \"project\": \"fuchsia\"\n            }\n          ],\n          \"properties\": {\n            \"$recipe_engine/buildbucket\": {\n              \"build\": {\n                \"builder\": {\n                  \"bucket\": \"try\",\n                  \"builder\": \"builder\",\n                  \"project\": \"fuchsia\"\n                },\n                \"createTime\": \"2018-05-25T23:50:17Z\",\n                \"createdBy\": \"project:fuchsia\",\n                \"executionTimeout\": \"36000s\",\n                \"id\": \"8945511751514863184\",\n                \"infra\": {\n                  \"backend\": {\n                    \"config\": {\n                      \"priority\": 30.0\n                    },\n                    \"task\": {\n                      \"id\": {\n                        \"target\": \"swarming://chromium-swarm\"\n                      }\n                    }\n                  },\n                  \"resultdb\": {\n                    \"invocation\": \"invocations/build:8945511751514863184\"\n                  }\n                },\n                \"input\": {\n                  \"gerritChanges\": [\n                    {\n                      \"change\": \"123456\",\n                      \"host\": \"fuchsia-review.googlesource.com\",\n                      \"patchset\": \"7\",\n                      \"project\": \"fuchsia\"\n                    }\n                  ]\n                },\n                \"tags\": [\n                  {\n                    \"key\": \"cq_experimental\",\n                    \"value\": \"false\"\n                  }\n                ]\n              }\n            },\n            \"integration_base_revision\": \"abc123\",\n            \"parent_id\": \"parentid\"\n          }\n        },\n        \"output\": {\n          \"properties\": {\n            \"test_orchestration_inputs_hash\": \"abc\"\n          }\n        },\n        \"status\": \"SUCCESS\",\n        \"tags\": [\n          {\n            \"key\": \"cq_experimental\",\n            \"value\": \"false\"\n          }\n        ]\n      }\n    }\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
diff --git a/recipe_modules/subbuild/tests/full.expected/missing_property.json b/recipe_modules/subbuild/tests/full.expected/missing_property.json
index 41dc99c..14a34dc 100644
--- a/recipe_modules/subbuild/tests/full.expected/missing_property.json
+++ b/recipe_modules/subbuild/tests/full.expected/missing_property.json
@@ -27,7 +27,7 @@
       }
     },
     "name": "launch builds.schedule",
-    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"builder-subbuild1\", \"project\": \"fuchsia\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"project\": \"fuchsia\", \"ref\": \"refs/heads/main\"}, \"properties\": {\"$recipe_engine/buildbucket\": {\"build\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"builder\", \"project\": \"fuchsia\"}, \"createTime\": \"2018-05-25T23:50:17Z\", \"createdBy\": \"user:luci-scheduler@appspot.gserviceaccount.com\", \"executionTimeout\": \"36000s\", \"id\": \"8945511751514863184\", \"infra\": {\"resultdb\": {\"invocation\": \"invocations/build:8945511751514863184\"}, \"swarming\": {\"priority\": 30.0}}, \"input\": {\"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"project\": \"fuchsia\", \"ref\": \"refs/heads/main\"}}}}, \"integration_base_revision\": \"abc123\", \"parent_id\": \"parentid\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"hide-in-gerrit\", \"value\": \"subbuild\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"skip-retry-in-gerrit\", \"value\": \"subbuild\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"builder-subbuild2\", \"project\": \"fuchsia\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"project\": \"fuchsia\", \"ref\": \"refs/heads/main\"}, \"properties\": {\"$recipe_engine/buildbucket\": {\"build\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"builder\", \"project\": \"fuchsia\"}, \"createTime\": \"2018-05-25T23:50:17Z\", \"createdBy\": \"user:luci-scheduler@appspot.gserviceaccount.com\", \"executionTimeout\": \"36000s\", \"id\": \"8945511751514863184\", \"infra\": {\"resultdb\": {\"invocation\": \"invocations/build:8945511751514863184\"}, \"swarming\": {\"priority\": 30.0}}, \"input\": {\"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"project\": \"fuchsia\", \"ref\": \"refs/heads/main\"}}}}, \"integration_base_revision\": \"abc123\", \"parent_id\": \"parentid\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"hide-in-gerrit\", \"value\": \"subbuild\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"skip-retry-in-gerrit\", \"value\": \"subbuild\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+    "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"builder-subbuild1\", \"project\": \"fuchsia\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"project\": \"fuchsia\", \"ref\": \"refs/heads/main\"}, \"properties\": {\"$recipe_engine/buildbucket\": {\"build\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"builder\", \"project\": \"fuchsia\"}, \"createTime\": \"2018-05-25T23:50:17Z\", \"createdBy\": \"user:luci-scheduler@appspot.gserviceaccount.com\", \"executionTimeout\": \"36000s\", \"id\": \"8945511751514863184\", \"infra\": {\"backend\": {\"config\": {\"priority\": 30.0}, \"task\": {\"id\": {\"target\": \"swarming://chromium-swarm\"}}}, \"resultdb\": {\"invocation\": \"invocations/build:8945511751514863184\"}}, \"input\": {\"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"project\": \"fuchsia\", \"ref\": \"refs/heads/main\"}}}}, \"integration_base_revision\": \"abc123\", \"parent_id\": \"parentid\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"hide-in-gerrit\", \"value\": \"subbuild\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"skip-retry-in-gerrit\", \"value\": \"subbuild\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"builder-subbuild2\", \"project\": \"fuchsia\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"project\": \"fuchsia\", \"ref\": \"refs/heads/main\"}, \"properties\": {\"$recipe_engine/buildbucket\": {\"build\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"builder\", \"project\": \"fuchsia\"}, \"createTime\": \"2018-05-25T23:50:17Z\", \"createdBy\": \"user:luci-scheduler@appspot.gserviceaccount.com\", \"executionTimeout\": \"36000s\", \"id\": \"8945511751514863184\", \"infra\": {\"backend\": {\"config\": {\"priority\": 30.0}, \"task\": {\"id\": {\"target\": \"swarming://chromium-swarm\"}}}, \"resultdb\": {\"invocation\": \"invocations/build:8945511751514863184\"}}, \"input\": {\"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"project\": \"fuchsia\", \"ref\": \"refs/heads/main\"}}}}, \"integration_base_revision\": \"abc123\", \"parent_id\": \"parentid\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"hide-in-gerrit\", \"value\": \"subbuild\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"skip-retry-in-gerrit\", \"value\": \"subbuild\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -78,11 +78,18 @@
       "@@@STEP_LOG_LINE@request@              \"executionTimeout\": \"36000s\",@@@",
       "@@@STEP_LOG_LINE@request@              \"id\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@request@              \"infra\": {@@@",
+      "@@@STEP_LOG_LINE@request@                \"backend\": {@@@",
+      "@@@STEP_LOG_LINE@request@                  \"config\": {@@@",
+      "@@@STEP_LOG_LINE@request@                    \"priority\": 30.0@@@",
+      "@@@STEP_LOG_LINE@request@                  },@@@",
+      "@@@STEP_LOG_LINE@request@                  \"task\": {@@@",
+      "@@@STEP_LOG_LINE@request@                    \"id\": {@@@",
+      "@@@STEP_LOG_LINE@request@                      \"target\": \"swarming://chromium-swarm\"@@@",
+      "@@@STEP_LOG_LINE@request@                    }@@@",
+      "@@@STEP_LOG_LINE@request@                  }@@@",
+      "@@@STEP_LOG_LINE@request@                },@@@",
       "@@@STEP_LOG_LINE@request@                \"resultdb\": {@@@",
       "@@@STEP_LOG_LINE@request@                  \"invocation\": \"invocations/build:8945511751514863184\"@@@",
-      "@@@STEP_LOG_LINE@request@                },@@@",
-      "@@@STEP_LOG_LINE@request@                \"swarming\": {@@@",
-      "@@@STEP_LOG_LINE@request@                  \"priority\": 30.0@@@",
       "@@@STEP_LOG_LINE@request@                }@@@",
       "@@@STEP_LOG_LINE@request@              },@@@",
       "@@@STEP_LOG_LINE@request@              \"input\": {@@@",
@@ -153,11 +160,18 @@
       "@@@STEP_LOG_LINE@request@              \"executionTimeout\": \"36000s\",@@@",
       "@@@STEP_LOG_LINE@request@              \"id\": \"8945511751514863184\",@@@",
       "@@@STEP_LOG_LINE@request@              \"infra\": {@@@",
+      "@@@STEP_LOG_LINE@request@                \"backend\": {@@@",
+      "@@@STEP_LOG_LINE@request@                  \"config\": {@@@",
+      "@@@STEP_LOG_LINE@request@                    \"priority\": 30.0@@@",
+      "@@@STEP_LOG_LINE@request@                  },@@@",
+      "@@@STEP_LOG_LINE@request@                  \"task\": {@@@",
+      "@@@STEP_LOG_LINE@request@                    \"id\": {@@@",
+      "@@@STEP_LOG_LINE@request@                      \"target\": \"swarming://chromium-swarm\"@@@",
+      "@@@STEP_LOG_LINE@request@                    }@@@",
+      "@@@STEP_LOG_LINE@request@                  }@@@",
+      "@@@STEP_LOG_LINE@request@                },@@@",
       "@@@STEP_LOG_LINE@request@                \"resultdb\": {@@@",
       "@@@STEP_LOG_LINE@request@                  \"invocation\": \"invocations/build:8945511751514863184\"@@@",
-      "@@@STEP_LOG_LINE@request@                },@@@",
-      "@@@STEP_LOG_LINE@request@                \"swarming\": {@@@",
-      "@@@STEP_LOG_LINE@request@                  \"priority\": 30.0@@@",
       "@@@STEP_LOG_LINE@request@                }@@@",
       "@@@STEP_LOG_LINE@request@              },@@@",
       "@@@STEP_LOG_LINE@request@              \"input\": {@@@",
diff --git a/recipes/cocoon/cipd.expected/cipd_mac_no_upload.json b/recipes/cocoon/cipd.expected/cipd_mac_no_upload.json
index 2207027..bc01dad 100644
--- a/recipes/cocoon/cipd.expected/cipd_mac_no_upload.json
+++ b/recipes/cocoon/cipd.expected/cipd_mac_no_upload.json
@@ -1,5 +1,24 @@
 [
   {
+    "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:try"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
     "cmd": [],
     "name": "Checkout flutter/cocoon"
   },
diff --git a/recipes/devicelab/devicelab_drone.expected/upload-metrics-mac-with-failures.json b/recipes/devicelab/devicelab_drone.expected/upload-metrics-mac-with-failures.json
index 52409cc..b22c670 100644
--- a/recipes/devicelab/devicelab_drone.expected/upload-metrics-mac-with-failures.json
+++ b/recipes/devicelab/devicelab_drone.expected/upload-metrics-mac-with-failures.json
@@ -1,6 +1,25 @@
 [
   {
     "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:ci"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
+    "cmd": [
       "top",
       "-l",
       "3",
diff --git a/recipes/devicelab/devicelab_drone.expected/upload-metrics-mac.json b/recipes/devicelab/devicelab_drone.expected/upload-metrics-mac.json
index 88b37b7..9718c3b 100644
--- a/recipes/devicelab/devicelab_drone.expected/upload-metrics-mac.json
+++ b/recipes/devicelab/devicelab_drone.expected/upload-metrics-mac.json
@@ -1,6 +1,25 @@
 [
   {
     "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:ci"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
+    "cmd": [
       "top",
       "-l",
       "3",
diff --git a/recipes/devicelab/devicelab_drone.expected/xcode-chromium-mac.json b/recipes/devicelab/devicelab_drone.expected/xcode-chromium-mac.json
index 69cb86f..1c38ebb 100644
--- a/recipes/devicelab/devicelab_drone.expected/xcode-chromium-mac.json
+++ b/recipes/devicelab/devicelab_drone.expected/xcode-chromium-mac.json
@@ -1,6 +1,25 @@
 [
   {
     "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:ci"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
+    "cmd": [
       "top",
       "-l",
       "3",
diff --git a/recipes/devicelab/devicelab_drone.expected/xcode-devicelab-timeout.json b/recipes/devicelab/devicelab_drone.expected/xcode-devicelab-timeout.json
index 037478f..b808362 100644
--- a/recipes/devicelab/devicelab_drone.expected/xcode-devicelab-timeout.json
+++ b/recipes/devicelab/devicelab_drone.expected/xcode-devicelab-timeout.json
@@ -1,6 +1,25 @@
 [
   {
     "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:ci"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
+    "cmd": [
       "top",
       "-l",
       "3",
diff --git a/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json b/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json
index 5696322..2f8b2eb 100644
--- a/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json
+++ b/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json
@@ -1,6 +1,25 @@
 [
   {
     "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:ci"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
+    "cmd": [
       "top",
       "-l",
       "3",
diff --git a/recipes/devicelab/devicelab_drone_build_test.expected/xcode-mac.json b/recipes/devicelab/devicelab_drone_build_test.expected/xcode-mac.json
index 57a16fe..b7624cb 100644
--- a/recipes/devicelab/devicelab_drone_build_test.expected/xcode-mac.json
+++ b/recipes/devicelab/devicelab_drone_build_test.expected/xcode-mac.json
@@ -1,6 +1,25 @@
 [
   {
     "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:ci"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
+    "cmd": [
       "top",
       "-l",
       "3",
@@ -704,6 +723,51 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_deadbeef"
+    ],
+    "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
+    "env": {
+      "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "master",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:ci"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "install xcode.Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
       "[CACHE]/osx_sdk/xcode_deadbeef/mac_toolchain",
       "install",
       "-kind",
@@ -713,7 +777,7 @@
       "-output-dir",
       "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app",
       "-cipd-package-prefix",
-      "flutter_internal/ios/xcode",
+      "infra_internal/ios/xcode",
       "-with-runtime=True",
       "-verbose"
     ],
@@ -930,12 +994,8 @@
   },
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
+      "rm",
+      "-rf",
       "[CACHE]/osx_sdk/xcode_deadbeef"
     ],
     "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
@@ -1180,6 +1240,51 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_deadbeef"
+    ],
+    "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
+    "env": {
+      "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "master",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:ci"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "install xcode (2).Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
       "[CACHE]/osx_sdk/xcode_deadbeef/mac_toolchain",
       "install",
       "-kind",
@@ -1189,7 +1294,7 @@
       "-output-dir",
       "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app",
       "-cipd-package-prefix",
-      "flutter_internal/ios/xcode",
+      "infra_internal/ios/xcode",
       "-with-runtime=True",
       "-verbose"
     ],
@@ -1234,6 +1339,371 @@
     ]
   },
   {
+    "cmd": [],
+    "name": "Cleaning up runtimes cache"
+  },
+  {
+    "cmd": [
+      "sudo",
+      "xcode-select",
+      "--switch",
+      "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app"
+    ],
+    "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
+    "env": {
+      "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "master",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:ci"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Cleaning up runtimes cache.select xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "runtime",
+      "delete",
+      "all"
+    ],
+    "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
+    "env": {
+      "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "master",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:ci"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Cleaning up runtimes cache.Cleaning up mounted simulator runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "xcodebuild",
+      "-version"
+    ],
+    "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
+    "env": {
+      "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "master",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:ci"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Cleaning up runtimes cache.check xcode version",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "list",
+      "runtimes"
+    ],
+    "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
+    "env": {
+      "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "master",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:ci"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Cleaning up runtimes cache.list runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "install runtimes"
+  },
+  {
+    "cmd": [],
+    "name": "install runtimes.install xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[CACHE]/osx_sdk/xcode_deadbeef",
+      "-ensure-file",
+      "infra/tools/mac_toolchain/${platform} latest",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
+    "env": {
+      "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "master",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:ci"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "install runtimes.install xcode.ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-latest----------\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      }@@@",
+      "@@@STEP_LOG_LINE@json.output@    ]@@@",
+      "@@@STEP_LOG_LINE@json.output@  }@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_deadbeef"
+    ],
+    "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
+    "env": {
+      "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "master",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:ci"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "install runtimes.install xcode.Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[CACHE]/osx_sdk/xcode_deadbeef/mac_toolchain",
+      "install",
+      "-kind",
+      "ios",
+      "-xcode-version",
+      "deadbeef",
+      "-output-dir",
+      "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app",
+      "-cipd-package-prefix",
+      "infra_internal/ios/xcode",
+      "-with-runtime=True",
+      "-verbose"
+    ],
+    "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
+    "env": {
+      "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "GIT_BRANCH": "master",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:ci"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "install runtimes.install xcode.install xcode from cipd",
+    "timeout": 1800,
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "killall",
       "-9",
diff --git a/recipes/devicelab/devicelab_test_drone.expected/mac.json b/recipes/devicelab/devicelab_test_drone.expected/mac.json
index b6e7682..9a798c8 100644
--- a/recipes/devicelab/devicelab_test_drone.expected/mac.json
+++ b/recipes/devicelab/devicelab_test_drone.expected/mac.json
@@ -1,6 +1,25 @@
 [
   {
     "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:ci"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
+    "cmd": [
       "top",
       "-l",
       "3",
@@ -674,6 +693,51 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CLEANUP]/tmp_tmp_3/osx_sdk"
+    ],
+    "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
+    "env": {
+      "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "GIT_BRANCH": "master",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:ci"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "install xcode.Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
       "[CLEANUP]/tmp_tmp_3/osx_sdk/mac_toolchain",
       "install",
       "-kind",
@@ -683,7 +747,7 @@
       "-output-dir",
       "/opt/flutter/xcode/deadbeef/XCode.app",
       "-cipd-package-prefix",
-      "flutter_internal/ios/xcode",
+      "infra_internal/ios/xcode",
       "-with-runtime=True",
       "-verbose"
     ],
@@ -1013,6 +1077,51 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CLEANUP]/tmp_tmp_4/osx_sdk"
+    ],
+    "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
+    "env": {
+      "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "GIT_BRANCH": "master",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:ci"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "install xcode (2).Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
       "[CLEANUP]/tmp_tmp_4/osx_sdk/mac_toolchain",
       "install",
       "-kind",
@@ -1022,7 +1131,7 @@
       "-output-dir",
       "/opt/flutter/xcode/deadbeef/XCode.app",
       "-cipd-package-prefix",
-      "flutter_internal/ios/xcode",
+      "infra_internal/ios/xcode",
       "-with-runtime=True",
       "-verbose"
     ],
@@ -1067,6 +1176,371 @@
     ]
   },
   {
+    "cmd": [],
+    "name": "Cleaning up runtimes cache"
+  },
+  {
+    "cmd": [
+      "sudo",
+      "xcode-select",
+      "--switch",
+      "/opt/flutter/xcode/deadbeef/XCode.app"
+    ],
+    "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
+    "env": {
+      "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "GIT_BRANCH": "master",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:ci"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Cleaning up runtimes cache.select xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "runtime",
+      "delete",
+      "all"
+    ],
+    "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
+    "env": {
+      "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "GIT_BRANCH": "master",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:ci"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Cleaning up runtimes cache.Cleaning up mounted simulator runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "xcodebuild",
+      "-version"
+    ],
+    "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
+    "env": {
+      "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "GIT_BRANCH": "master",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:ci"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Cleaning up runtimes cache.check xcode version",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "list",
+      "runtimes"
+    ],
+    "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
+    "env": {
+      "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "GIT_BRANCH": "master",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:ci"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Cleaning up runtimes cache.list runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "install runtimes"
+  },
+  {
+    "cmd": [],
+    "name": "install runtimes.install xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[CLEANUP]/tmp_tmp_4/osx_sdk",
+      "-ensure-file",
+      "infra/tools/mac_toolchain/${platform} latest",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
+    "env": {
+      "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "GIT_BRANCH": "master",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:ci"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "install runtimes.install xcode.ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-latest----------\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      }@@@",
+      "@@@STEP_LOG_LINE@json.output@    ]@@@",
+      "@@@STEP_LOG_LINE@json.output@  }@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "ls",
+      "-al",
+      "[CLEANUP]/tmp_tmp_4/osx_sdk"
+    ],
+    "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
+    "env": {
+      "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "GIT_BRANCH": "master",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:ci"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "install runtimes.install xcode.Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[CLEANUP]/tmp_tmp_4/osx_sdk/mac_toolchain",
+      "install",
+      "-kind",
+      "ios",
+      "-xcode-version",
+      "deadbeef",
+      "-output-dir",
+      "/opt/flutter/xcode/deadbeef/XCode.app",
+      "-cipd-package-prefix",
+      "infra_internal/ios/xcode",
+      "-with-runtime=True",
+      "-verbose"
+    ],
+    "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
+    "env": {
+      "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
+      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
+      "GIT_BRANCH": "master",
+      "LUCI_BRANCH": "",
+      "LUCI_CI": "True",
+      "LUCI_PR": "",
+      "OS": "darwin",
+      "PUB_CACHE": "[START_DIR]/.pub-cache",
+      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+      "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk"
+    },
+    "env_prefixes": {
+      "PATH": [
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
+        "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
+      ]
+    },
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "project:ci"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "install runtimes.install xcode.install xcode from cipd",
+    "timeout": 1800,
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "killall",
       "-9",
diff --git a/recipes/engine_v2/builder.expected/mac.json b/recipes/engine_v2/builder.expected/mac.json
index 35bd08a..73d3699 100644
--- a/recipes/engine_v2/builder.expected/mac.json
+++ b/recipes/engine_v2/builder.expected/mac.json
@@ -1,6 +1,25 @@
 [
   {
     "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "flutter:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
+    "cmd": [
       "top",
       "-l",
       "3",
@@ -474,7 +493,7 @@
   {
     "cmd": [
       "echo",
-      "[CACHE]/osx_sdk/xcode_9f2000"
+      "[CACHE]/osx_sdk/xcode_12a7209"
     ],
     "infra_step": true,
     "luci_context": {
@@ -554,7 +573,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/osx_sdk/xcode_9f2000",
+      "[CACHE]/osx_sdk/xcode_12a7209",
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} latest",
       "-max-threads",
@@ -593,16 +612,40 @@
   },
   {
     "cmd": [
-      "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_12a7209"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "flutter:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "install xcode.Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[CACHE]/osx_sdk/xcode_12a7209/mac_toolchain",
       "install",
       "-kind",
       "ios",
       "-xcode-version",
-      "9f2000",
+      "12a7209",
       "-output-dir",
-      "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
+      "[CACHE]/osx_sdk/xcode_12a7209/XCode.app",
       "-cipd-package-prefix",
-      "flutter_internal/ios/xcode",
+      "infra_internal/ios/xcode",
       "-with-runtime=True",
       "-verbose"
     ],
@@ -652,7 +695,7 @@
       "sudo",
       "xcode-select",
       "--switch",
-      "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
+      "[CACHE]/osx_sdk/xcode_12a7209/XCode.app"
     ],
     "infra_step": true,
     "luci_context": {
@@ -714,13 +757,9 @@
   },
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[CACHE]/osx_sdk/xcode_9f2000"
+      "rm",
+      "-rf",
+      "[CACHE]/osx_sdk/xcode_12a7209"
     ],
     "infra_step": true,
     "luci_context": {
@@ -740,7 +779,7 @@
   {
     "cmd": [
       "echo",
-      "[CACHE]/osx_sdk/xcode_9f2000"
+      "[CACHE]/osx_sdk/xcode_12a7209"
     ],
     "infra_step": true,
     "luci_context": {
@@ -820,7 +859,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/osx_sdk/xcode_9f2000",
+      "[CACHE]/osx_sdk/xcode_12a7209",
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} latest",
       "-max-threads",
@@ -859,16 +898,40 @@
   },
   {
     "cmd": [
-      "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_12a7209"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "flutter:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "install xcode (2).Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[CACHE]/osx_sdk/xcode_12a7209/mac_toolchain",
       "install",
       "-kind",
       "ios",
       "-xcode-version",
-      "9f2000",
+      "12a7209",
       "-output-dir",
-      "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
+      "[CACHE]/osx_sdk/xcode_12a7209/XCode.app",
       "-cipd-package-prefix",
-      "flutter_internal/ios/xcode",
+      "infra_internal/ios/xcode",
       "-with-runtime=True",
       "-verbose"
     ],
@@ -892,6 +955,224 @@
     ]
   },
   {
+    "cmd": [],
+    "name": "Cleaning up runtimes cache"
+  },
+  {
+    "cmd": [
+      "sudo",
+      "xcode-select",
+      "--switch",
+      "[CACHE]/osx_sdk/xcode_12a7209/XCode.app"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "flutter:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Cleaning up runtimes cache.select xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "runtime",
+      "delete",
+      "all"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "flutter:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Cleaning up runtimes cache.Cleaning up mounted simulator runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "xcodebuild",
+      "-version"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "flutter:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Cleaning up runtimes cache.check xcode version",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "list",
+      "runtimes"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "flutter:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Cleaning up runtimes cache.list runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "install runtimes"
+  },
+  {
+    "cmd": [],
+    "name": "install runtimes.install xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[CACHE]/osx_sdk/xcode_12a7209",
+      "-ensure-file",
+      "infra/tools/mac_toolchain/${platform} latest",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "flutter:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "install runtimes.install xcode.ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-latest----------\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      }@@@",
+      "@@@STEP_LOG_LINE@json.output@    ]@@@",
+      "@@@STEP_LOG_LINE@json.output@  }@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_12a7209"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "flutter:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "install runtimes.install xcode.Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[CACHE]/osx_sdk/xcode_12a7209/mac_toolchain",
+      "install",
+      "-kind",
+      "ios",
+      "-xcode-version",
+      "12a7209",
+      "-output-dir",
+      "[CACHE]/osx_sdk/xcode_12a7209/XCode.app",
+      "-cipd-package-prefix",
+      "infra_internal/ios/xcode",
+      "-with-runtime=True",
+      "-verbose"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "flutter:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "install runtimes.install xcode.install xcode from cipd",
+    "timeout": 1800,
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "killall",
       "-9",
@@ -918,7 +1199,7 @@
       "sudo",
       "xcode-select",
       "--switch",
-      "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
+      "[CACHE]/osx_sdk/xcode_12a7209/XCode.app"
     ],
     "infra_step": true,
     "luci_context": {
diff --git a/recipes/engine_v2/engine_v2.expected/basic_mac.json b/recipes/engine_v2/engine_v2.expected/basic_mac.json
index 9acb237..6f24447 100644
--- a/recipes/engine_v2/engine_v2.expected/basic_mac.json
+++ b/recipes/engine_v2/engine_v2.expected/basic_mac.json
@@ -1,5 +1,24 @@
 [
   {
+    "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "flutter:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
     "cmd": [],
     "name": "launch builds"
   },
@@ -653,7 +672,7 @@
   {
     "cmd": [
       "echo",
-      "[CACHE]/osx_sdk/xcode_9f2000"
+      "[CACHE]/osx_sdk/xcode_12a7209"
     ],
     "infra_step": true,
     "luci_context": {
@@ -748,7 +767,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/osx_sdk/xcode_9f2000",
+      "[CACHE]/osx_sdk/xcode_12a7209",
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} latest",
       "-max-threads",
@@ -787,16 +806,40 @@
   },
   {
     "cmd": [
-      "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_12a7209"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "flutter:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Global generators.install xcode.Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[CACHE]/osx_sdk/xcode_12a7209/mac_toolchain",
       "install",
       "-kind",
       "ios",
       "-xcode-version",
-      "9f2000",
+      "12a7209",
       "-output-dir",
-      "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
+      "[CACHE]/osx_sdk/xcode_12a7209/XCode.app",
       "-cipd-package-prefix",
-      "flutter_internal/ios/xcode",
+      "infra_internal/ios/xcode",
       "-with-runtime=True",
       "-verbose"
     ],
@@ -849,7 +892,7 @@
       "sudo",
       "xcode-select",
       "--switch",
-      "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
+      "[CACHE]/osx_sdk/xcode_12a7209/XCode.app"
     ],
     "infra_step": true,
     "luci_context": {
@@ -920,13 +963,9 @@
   },
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[CACHE]/osx_sdk/xcode_9f2000"
+      "rm",
+      "-rf",
+      "[CACHE]/osx_sdk/xcode_12a7209"
     ],
     "infra_step": true,
     "luci_context": {
@@ -949,7 +988,7 @@
   {
     "cmd": [
       "echo",
-      "[CACHE]/osx_sdk/xcode_9f2000"
+      "[CACHE]/osx_sdk/xcode_12a7209"
     ],
     "infra_step": true,
     "luci_context": {
@@ -1044,7 +1083,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/osx_sdk/xcode_9f2000",
+      "[CACHE]/osx_sdk/xcode_12a7209",
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} latest",
       "-max-threads",
@@ -1083,16 +1122,40 @@
   },
   {
     "cmd": [
-      "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_12a7209"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "flutter:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Global generators.install xcode (2).Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[CACHE]/osx_sdk/xcode_12a7209/mac_toolchain",
       "install",
       "-kind",
       "ios",
       "-xcode-version",
-      "9f2000",
+      "12a7209",
       "-output-dir",
-      "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
+      "[CACHE]/osx_sdk/xcode_12a7209/XCode.app",
       "-cipd-package-prefix",
-      "flutter_internal/ios/xcode",
+      "infra_internal/ios/xcode",
       "-with-runtime=True",
       "-verbose"
     ],
@@ -1116,6 +1179,230 @@
     ]
   },
   {
+    "cmd": [],
+    "name": "Global generators.Cleaning up runtimes cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "sudo",
+      "xcode-select",
+      "--switch",
+      "[CACHE]/osx_sdk/xcode_12a7209/XCode.app"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "flutter:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Global generators.Cleaning up runtimes cache.select xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "runtime",
+      "delete",
+      "all"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "flutter:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Global generators.Cleaning up runtimes cache.Cleaning up mounted simulator runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "xcodebuild",
+      "-version"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "flutter:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Global generators.Cleaning up runtimes cache.check xcode version",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "list",
+      "runtimes"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "flutter:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Global generators.Cleaning up runtimes cache.list runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "Global generators.install runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "Global generators.install runtimes.install xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[CACHE]/osx_sdk/xcode_12a7209",
+      "-ensure-file",
+      "infra/tools/mac_toolchain/${platform} latest",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "flutter:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Global generators.install runtimes.install xcode.ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-latest----------\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      }@@@",
+      "@@@STEP_LOG_LINE@json.output@    ]@@@",
+      "@@@STEP_LOG_LINE@json.output@  }@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_12a7209"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "flutter:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Global generators.install runtimes.install xcode.Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@3@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[CACHE]/osx_sdk/xcode_12a7209/mac_toolchain",
+      "install",
+      "-kind",
+      "ios",
+      "-xcode-version",
+      "12a7209",
+      "-output-dir",
+      "[CACHE]/osx_sdk/xcode_12a7209/XCode.app",
+      "-cipd-package-prefix",
+      "infra_internal/ios/xcode",
+      "-with-runtime=True",
+      "-verbose"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "flutter:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Global generators.install runtimes.install xcode.install xcode from cipd",
+    "timeout": 1800,
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@3@@@"
+    ]
+  },
+  {
     "cmd": [
       "killall",
       "-9",
@@ -1145,7 +1432,7 @@
       "sudo",
       "xcode-select",
       "--switch",
-      "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
+      "[CACHE]/osx_sdk/xcode_12a7209/XCode.app"
     ],
     "infra_step": true,
     "luci_context": {
diff --git a/recipes/engine_v2/engine_v2.expected/basic_mac_dart_internal.json b/recipes/engine_v2/engine_v2.expected/basic_mac_dart_internal.json
index aeed769..66fd0aa 100644
--- a/recipes/engine_v2/engine_v2.expected/basic_mac_dart_internal.json
+++ b/recipes/engine_v2/engine_v2.expected/basic_mac_dart_internal.json
@@ -1,6 +1,25 @@
 [
   {
     "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "dart-internal:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
+    "cmd": [
       "cipd",
       "ensure",
       "-root",
@@ -706,7 +725,7 @@
   {
     "cmd": [
       "echo",
-      "[CACHE]/osx_sdk/xcode_9f2000"
+      "[CACHE]/osx_sdk/xcode_12a7209"
     ],
     "infra_step": true,
     "luci_context": {
@@ -801,7 +820,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/osx_sdk/xcode_9f2000",
+      "[CACHE]/osx_sdk/xcode_12a7209",
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} latest",
       "-max-threads",
@@ -840,16 +859,40 @@
   },
   {
     "cmd": [
-      "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_12a7209"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "dart-internal:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Global generators.install xcode.Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[CACHE]/osx_sdk/xcode_12a7209/mac_toolchain",
       "install",
       "-kind",
       "ios",
       "-xcode-version",
-      "9f2000",
+      "12a7209",
       "-output-dir",
-      "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
+      "[CACHE]/osx_sdk/xcode_12a7209/XCode.app",
       "-cipd-package-prefix",
-      "flutter_internal/ios/xcode",
+      "infra_internal/ios/xcode",
       "-with-runtime=True",
       "-verbose"
     ],
@@ -902,7 +945,7 @@
       "sudo",
       "xcode-select",
       "--switch",
-      "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
+      "[CACHE]/osx_sdk/xcode_12a7209/XCode.app"
     ],
     "infra_step": true,
     "luci_context": {
@@ -973,13 +1016,9 @@
   },
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[CACHE]/osx_sdk/xcode_9f2000"
+      "rm",
+      "-rf",
+      "[CACHE]/osx_sdk/xcode_12a7209"
     ],
     "infra_step": true,
     "luci_context": {
@@ -1002,7 +1041,7 @@
   {
     "cmd": [
       "echo",
-      "[CACHE]/osx_sdk/xcode_9f2000"
+      "[CACHE]/osx_sdk/xcode_12a7209"
     ],
     "infra_step": true,
     "luci_context": {
@@ -1097,7 +1136,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/osx_sdk/xcode_9f2000",
+      "[CACHE]/osx_sdk/xcode_12a7209",
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} latest",
       "-max-threads",
@@ -1136,16 +1175,40 @@
   },
   {
     "cmd": [
-      "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_12a7209"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "dart-internal:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Global generators.install xcode (2).Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[CACHE]/osx_sdk/xcode_12a7209/mac_toolchain",
       "install",
       "-kind",
       "ios",
       "-xcode-version",
-      "9f2000",
+      "12a7209",
       "-output-dir",
-      "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
+      "[CACHE]/osx_sdk/xcode_12a7209/XCode.app",
       "-cipd-package-prefix",
-      "flutter_internal/ios/xcode",
+      "infra_internal/ios/xcode",
       "-with-runtime=True",
       "-verbose"
     ],
@@ -1169,6 +1232,230 @@
     ]
   },
   {
+    "cmd": [],
+    "name": "Global generators.Cleaning up runtimes cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "sudo",
+      "xcode-select",
+      "--switch",
+      "[CACHE]/osx_sdk/xcode_12a7209/XCode.app"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "dart-internal:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Global generators.Cleaning up runtimes cache.select xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "runtime",
+      "delete",
+      "all"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "dart-internal:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Global generators.Cleaning up runtimes cache.Cleaning up mounted simulator runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "xcodebuild",
+      "-version"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "dart-internal:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Global generators.Cleaning up runtimes cache.check xcode version",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "list",
+      "runtimes"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "dart-internal:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Global generators.Cleaning up runtimes cache.list runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "Global generators.install runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "Global generators.install runtimes.install xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[CACHE]/osx_sdk/xcode_12a7209",
+      "-ensure-file",
+      "infra/tools/mac_toolchain/${platform} latest",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "dart-internal:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Global generators.install runtimes.install xcode.ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-latest----------\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      }@@@",
+      "@@@STEP_LOG_LINE@json.output@    ]@@@",
+      "@@@STEP_LOG_LINE@json.output@  }@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_12a7209"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "dart-internal:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Global generators.install runtimes.install xcode.Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@3@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[CACHE]/osx_sdk/xcode_12a7209/mac_toolchain",
+      "install",
+      "-kind",
+      "ios",
+      "-xcode-version",
+      "12a7209",
+      "-output-dir",
+      "[CACHE]/osx_sdk/xcode_12a7209/XCode.app",
+      "-cipd-package-prefix",
+      "infra_internal/ios/xcode",
+      "-with-runtime=True",
+      "-verbose"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "dart-internal:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Global generators.install runtimes.install xcode.install xcode from cipd",
+    "timeout": 1800,
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@3@@@"
+    ]
+  },
+  {
     "cmd": [
       "killall",
       "-9",
@@ -1198,7 +1485,7 @@
       "sudo",
       "xcode-select",
       "--switch",
-      "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
+      "[CACHE]/osx_sdk/xcode_12a7209/XCode.app"
     ],
     "infra_step": true,
     "luci_context": {
diff --git a/recipes/engine_v2/engine_v2.expected/codesign_release_branch.json b/recipes/engine_v2/engine_v2.expected/codesign_release_branch.json
index 7d722bd..a294c45 100644
--- a/recipes/engine_v2/engine_v2.expected/codesign_release_branch.json
+++ b/recipes/engine_v2/engine_v2.expected/codesign_release_branch.json
@@ -1,5 +1,24 @@
 [
   {
+    "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "proj:try"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
     "cmd": [],
     "name": "Checkout flutter/engine"
   },
@@ -1130,7 +1149,7 @@
   {
     "cmd": [
       "echo",
-      "[CACHE]/osx_sdk/xcode_9f2000"
+      "[CACHE]/osx_sdk/xcode_12a7209"
     ],
     "infra_step": true,
     "luci_context": {
@@ -1225,7 +1244,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/osx_sdk/xcode_9f2000",
+      "[CACHE]/osx_sdk/xcode_12a7209",
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} latest",
       "-max-threads",
@@ -1264,16 +1283,40 @@
   },
   {
     "cmd": [
-      "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_12a7209"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "proj:try"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Global generators.install xcode.Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[CACHE]/osx_sdk/xcode_12a7209/mac_toolchain",
       "install",
       "-kind",
       "ios",
       "-xcode-version",
-      "9f2000",
+      "12a7209",
       "-output-dir",
-      "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
+      "[CACHE]/osx_sdk/xcode_12a7209/XCode.app",
       "-cipd-package-prefix",
-      "flutter_internal/ios/xcode",
+      "infra_internal/ios/xcode",
       "-with-runtime=True",
       "-verbose"
     ],
@@ -1326,7 +1369,7 @@
       "sudo",
       "xcode-select",
       "--switch",
-      "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
+      "[CACHE]/osx_sdk/xcode_12a7209/XCode.app"
     ],
     "infra_step": true,
     "luci_context": {
@@ -1397,13 +1440,9 @@
   },
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "rmtree",
-      "[CACHE]/osx_sdk/xcode_9f2000"
+      "rm",
+      "-rf",
+      "[CACHE]/osx_sdk/xcode_12a7209"
     ],
     "infra_step": true,
     "luci_context": {
@@ -1426,7 +1465,7 @@
   {
     "cmd": [
       "echo",
-      "[CACHE]/osx_sdk/xcode_9f2000"
+      "[CACHE]/osx_sdk/xcode_12a7209"
     ],
     "infra_step": true,
     "luci_context": {
@@ -1521,7 +1560,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[CACHE]/osx_sdk/xcode_9f2000",
+      "[CACHE]/osx_sdk/xcode_12a7209",
       "-ensure-file",
       "infra/tools/mac_toolchain/${platform} latest",
       "-max-threads",
@@ -1560,16 +1599,40 @@
   },
   {
     "cmd": [
-      "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_12a7209"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "proj:try"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Global generators.install xcode (2).Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[CACHE]/osx_sdk/xcode_12a7209/mac_toolchain",
       "install",
       "-kind",
       "ios",
       "-xcode-version",
-      "9f2000",
+      "12a7209",
       "-output-dir",
-      "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
+      "[CACHE]/osx_sdk/xcode_12a7209/XCode.app",
       "-cipd-package-prefix",
-      "flutter_internal/ios/xcode",
+      "infra_internal/ios/xcode",
       "-with-runtime=True",
       "-verbose"
     ],
@@ -1593,6 +1656,230 @@
     ]
   },
   {
+    "cmd": [],
+    "name": "Global generators.Cleaning up runtimes cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "sudo",
+      "xcode-select",
+      "--switch",
+      "[CACHE]/osx_sdk/xcode_12a7209/XCode.app"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "proj:try"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Global generators.Cleaning up runtimes cache.select xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "runtime",
+      "delete",
+      "all"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "proj:try"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Global generators.Cleaning up runtimes cache.Cleaning up mounted simulator runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "xcodebuild",
+      "-version"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "proj:try"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Global generators.Cleaning up runtimes cache.check xcode version",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "xcrun",
+      "simctl",
+      "list",
+      "runtimes"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "proj:try"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Global generators.Cleaning up runtimes cache.list runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_LOG_END@raw_io.output_text@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "Global generators.install runtimes",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "Global generators.install runtimes.install xcode",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[CACHE]/osx_sdk/xcode_12a7209",
+      "-ensure-file",
+      "infra/tools/mac_toolchain/${platform} latest",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "proj:try"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Global generators.install runtimes.install xcode.ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-latest----------\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      }@@@",
+      "@@@STEP_LOG_LINE@json.output@    ]@@@",
+      "@@@STEP_LOG_LINE@json.output@  }@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_12a7209"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "proj:try"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Global generators.install runtimes.install xcode.Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@3@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "[CACHE]/osx_sdk/xcode_12a7209/mac_toolchain",
+      "install",
+      "-kind",
+      "ios",
+      "-xcode-version",
+      "12a7209",
+      "-output-dir",
+      "[CACHE]/osx_sdk/xcode_12a7209/XCode.app",
+      "-cipd-package-prefix",
+      "infra_internal/ios/xcode",
+      "-with-runtime=True",
+      "-verbose"
+    ],
+    "infra_step": true,
+    "luci_context": {
+      "realm": {
+        "name": "proj:try"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "Global generators.install runtimes.install xcode.install xcode from cipd",
+    "timeout": 1800,
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@3@@@"
+    ]
+  },
+  {
     "cmd": [
       "killall",
       "-9",
@@ -1622,7 +1909,7 @@
       "sudo",
       "xcode-select",
       "--switch",
-      "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
+      "[CACHE]/osx_sdk/xcode_12a7209/XCode.app"
     ],
     "infra_step": true,
     "luci_context": {
diff --git a/recipes/packaging/packaging.expected/mac_invalidbeta_experimental_flutter.json b/recipes/packaging/packaging.expected/mac_invalidbeta_experimental_flutter.json
index 2a8d323..6eddac7 100644
--- a/recipes/packaging/packaging.expected/mac_invalidbeta_experimental_flutter.json
+++ b/recipes/packaging/packaging.expected/mac_invalidbeta_experimental_flutter.json
@@ -1,6 +1,25 @@
 [
   {
     "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
+    "cmd": [
       "cipd",
       "ensure",
       "-root",
diff --git a/recipes/packaging/packaging.expected/mac_invalidbeta_experimental_prod.json b/recipes/packaging/packaging.expected/mac_invalidbeta_experimental_prod.json
index 551cbdf..427dba4 100644
--- a/recipes/packaging/packaging.expected/mac_invalidbeta_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/mac_invalidbeta_experimental_prod.json
@@ -1,5 +1,24 @@
 [
   {
+    "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
diff --git a/recipes/packaging/packaging.expected/mac_invalidbeta_experimental_staging.json b/recipes/packaging/packaging.expected/mac_invalidbeta_experimental_staging.json
index 17ad16a..405f1ba 100644
--- a/recipes/packaging/packaging.expected/mac_invalidbeta_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/mac_invalidbeta_experimental_staging.json
@@ -1,5 +1,24 @@
 [
   {
+    "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:staging"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
diff --git a/recipes/packaging/packaging.expected/mac_invalidbeta_flutter.json b/recipes/packaging/packaging.expected/mac_invalidbeta_flutter.json
index 2a8d323..6eddac7 100644
--- a/recipes/packaging/packaging.expected/mac_invalidbeta_flutter.json
+++ b/recipes/packaging/packaging.expected/mac_invalidbeta_flutter.json
@@ -1,6 +1,25 @@
 [
   {
     "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
+    "cmd": [
       "cipd",
       "ensure",
       "-root",
diff --git a/recipes/packaging/packaging.expected/mac_invalidbeta_prod.json b/recipes/packaging/packaging.expected/mac_invalidbeta_prod.json
index 551cbdf..427dba4 100644
--- a/recipes/packaging/packaging.expected/mac_invalidbeta_prod.json
+++ b/recipes/packaging/packaging.expected/mac_invalidbeta_prod.json
@@ -1,5 +1,24 @@
 [
   {
+    "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
diff --git a/recipes/packaging/packaging.expected/mac_invalidbeta_staging.json b/recipes/packaging/packaging.expected/mac_invalidbeta_staging.json
index 17ad16a..405f1ba 100644
--- a/recipes/packaging/packaging.expected/mac_invalidbeta_staging.json
+++ b/recipes/packaging/packaging.expected/mac_invalidbeta_staging.json
@@ -1,5 +1,24 @@
 [
   {
+    "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:staging"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
diff --git a/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_experimental_flutter.json b/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_experimental_flutter.json
index 77dc969..3784419 100644
--- a/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_experimental_flutter.json
+++ b/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_experimental_flutter.json
@@ -1,6 +1,25 @@
 [
   {
     "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
+    "cmd": [
       "cipd",
       "ensure",
       "-root",
diff --git a/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_experimental_prod.json b/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_experimental_prod.json
index 59081ff..0b470c1 100644
--- a/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_experimental_prod.json
@@ -1,5 +1,24 @@
 [
   {
+    "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
diff --git a/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_experimental_staging.json b/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_experimental_staging.json
index 98680f7..34b3a19 100644
--- a/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_experimental_staging.json
@@ -1,5 +1,24 @@
 [
   {
+    "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:staging"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
diff --git a/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_flutter.json b/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_flutter.json
index 77dc969..3784419 100644
--- a/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_flutter.json
+++ b/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_flutter.json
@@ -1,6 +1,25 @@
 [
   {
     "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
+    "cmd": [
       "cipd",
       "ensure",
       "-root",
diff --git a/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_prod.json b/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_prod.json
index 59081ff..0b470c1 100644
--- a/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_prod.json
+++ b/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_prod.json
@@ -1,5 +1,24 @@
 [
   {
+    "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
diff --git a/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_staging.json b/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_staging.json
index 98680f7..34b3a19 100644
--- a/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_staging.json
+++ b/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_staging.json
@@ -1,5 +1,24 @@
 [
   {
+    "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:staging"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
diff --git a/recipes/packaging/packaging.expected/mac_invalidmaster_experimental_flutter.json b/recipes/packaging/packaging.expected/mac_invalidmaster_experimental_flutter.json
index 5a96f6a..fab7ded 100644
--- a/recipes/packaging/packaging.expected/mac_invalidmaster_experimental_flutter.json
+++ b/recipes/packaging/packaging.expected/mac_invalidmaster_experimental_flutter.json
@@ -1,6 +1,25 @@
 [
   {
     "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
+    "cmd": [
       "cipd",
       "ensure",
       "-root",
diff --git a/recipes/packaging/packaging.expected/mac_invalidmaster_experimental_prod.json b/recipes/packaging/packaging.expected/mac_invalidmaster_experimental_prod.json
index 068f4d6..b58944d 100644
--- a/recipes/packaging/packaging.expected/mac_invalidmaster_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/mac_invalidmaster_experimental_prod.json
@@ -1,5 +1,24 @@
 [
   {
+    "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
diff --git a/recipes/packaging/packaging.expected/mac_invalidmaster_experimental_staging.json b/recipes/packaging/packaging.expected/mac_invalidmaster_experimental_staging.json
index b350603..ade40cb 100644
--- a/recipes/packaging/packaging.expected/mac_invalidmaster_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/mac_invalidmaster_experimental_staging.json
@@ -1,5 +1,24 @@
 [
   {
+    "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:staging"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
diff --git a/recipes/packaging/packaging.expected/mac_invalidmaster_flutter.json b/recipes/packaging/packaging.expected/mac_invalidmaster_flutter.json
index 5a96f6a..fab7ded 100644
--- a/recipes/packaging/packaging.expected/mac_invalidmaster_flutter.json
+++ b/recipes/packaging/packaging.expected/mac_invalidmaster_flutter.json
@@ -1,6 +1,25 @@
 [
   {
     "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
+    "cmd": [
       "cipd",
       "ensure",
       "-root",
diff --git a/recipes/packaging/packaging.expected/mac_invalidmaster_prod.json b/recipes/packaging/packaging.expected/mac_invalidmaster_prod.json
index 068f4d6..b58944d 100644
--- a/recipes/packaging/packaging.expected/mac_invalidmaster_prod.json
+++ b/recipes/packaging/packaging.expected/mac_invalidmaster_prod.json
@@ -1,5 +1,24 @@
 [
   {
+    "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
diff --git a/recipes/packaging/packaging.expected/mac_invalidmaster_staging.json b/recipes/packaging/packaging.expected/mac_invalidmaster_staging.json
index b350603..ade40cb 100644
--- a/recipes/packaging/packaging.expected/mac_invalidmaster_staging.json
+++ b/recipes/packaging/packaging.expected/mac_invalidmaster_staging.json
@@ -1,5 +1,24 @@
 [
   {
+    "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:staging"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
diff --git a/recipes/packaging/packaging.expected/mac_invalidstable_experimental_flutter.json b/recipes/packaging/packaging.expected/mac_invalidstable_experimental_flutter.json
index 230e725..91dee79 100644
--- a/recipes/packaging/packaging.expected/mac_invalidstable_experimental_flutter.json
+++ b/recipes/packaging/packaging.expected/mac_invalidstable_experimental_flutter.json
@@ -1,6 +1,25 @@
 [
   {
     "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
+    "cmd": [
       "cipd",
       "ensure",
       "-root",
diff --git a/recipes/packaging/packaging.expected/mac_invalidstable_experimental_prod.json b/recipes/packaging/packaging.expected/mac_invalidstable_experimental_prod.json
index 0c75c47..31144f7 100644
--- a/recipes/packaging/packaging.expected/mac_invalidstable_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/mac_invalidstable_experimental_prod.json
@@ -1,5 +1,24 @@
 [
   {
+    "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
diff --git a/recipes/packaging/packaging.expected/mac_invalidstable_experimental_staging.json b/recipes/packaging/packaging.expected/mac_invalidstable_experimental_staging.json
index 2eb9074..11a19cf 100644
--- a/recipes/packaging/packaging.expected/mac_invalidstable_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/mac_invalidstable_experimental_staging.json
@@ -1,5 +1,24 @@
 [
   {
+    "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:staging"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
diff --git a/recipes/packaging/packaging.expected/mac_invalidstable_flutter.json b/recipes/packaging/packaging.expected/mac_invalidstable_flutter.json
index 230e725..91dee79 100644
--- a/recipes/packaging/packaging.expected/mac_invalidstable_flutter.json
+++ b/recipes/packaging/packaging.expected/mac_invalidstable_flutter.json
@@ -1,6 +1,25 @@
 [
   {
     "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
+    "cmd": [
       "cipd",
       "ensure",
       "-root",
diff --git a/recipes/packaging/packaging.expected/mac_invalidstable_prod.json b/recipes/packaging/packaging.expected/mac_invalidstable_prod.json
index 0c75c47..31144f7 100644
--- a/recipes/packaging/packaging.expected/mac_invalidstable_prod.json
+++ b/recipes/packaging/packaging.expected/mac_invalidstable_prod.json
@@ -1,5 +1,24 @@
 [
   {
+    "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
diff --git a/recipes/packaging/packaging.expected/mac_invalidstable_staging.json b/recipes/packaging/packaging.expected/mac_invalidstable_staging.json
index 2eb9074..11a19cf 100644
--- a/recipes/packaging/packaging.expected/mac_invalidstable_staging.json
+++ b/recipes/packaging/packaging.expected/mac_invalidstable_staging.json
@@ -1,5 +1,24 @@
 [
   {
+    "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:staging"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
diff --git a/recipes/packaging/packaging.expected/mac_refs_heads_beta_experimental_flutter.json b/recipes/packaging/packaging.expected/mac_refs_heads_beta_experimental_flutter.json
index 4272b65..c543cdd 100644
--- a/recipes/packaging/packaging.expected/mac_refs_heads_beta_experimental_flutter.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_beta_experimental_flutter.json
@@ -1,6 +1,25 @@
 [
   {
     "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
+    "cmd": [
       "cipd",
       "ensure",
       "-root",
diff --git a/recipes/packaging/packaging.expected/mac_refs_heads_beta_experimental_prod.json b/recipes/packaging/packaging.expected/mac_refs_heads_beta_experimental_prod.json
index 476f1fb..7f76fa5 100644
--- a/recipes/packaging/packaging.expected/mac_refs_heads_beta_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_beta_experimental_prod.json
@@ -1,5 +1,24 @@
 [
   {
+    "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
diff --git a/recipes/packaging/packaging.expected/mac_refs_heads_beta_experimental_staging.json b/recipes/packaging/packaging.expected/mac_refs_heads_beta_experimental_staging.json
index f228226..8d39799 100644
--- a/recipes/packaging/packaging.expected/mac_refs_heads_beta_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_beta_experimental_staging.json
@@ -1,5 +1,24 @@
 [
   {
+    "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:staging"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
diff --git a/recipes/packaging/packaging.expected/mac_refs_heads_beta_flutter.json b/recipes/packaging/packaging.expected/mac_refs_heads_beta_flutter.json
index 036c472..68c70e6 100644
--- a/recipes/packaging/packaging.expected/mac_refs_heads_beta_flutter.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_beta_flutter.json
@@ -1,6 +1,25 @@
 [
   {
     "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
+    "cmd": [
       "cipd",
       "ensure",
       "-root",
diff --git a/recipes/packaging/packaging.expected/mac_refs_heads_beta_prod.json b/recipes/packaging/packaging.expected/mac_refs_heads_beta_prod.json
index 2ca1ccb..c454086 100644
--- a/recipes/packaging/packaging.expected/mac_refs_heads_beta_prod.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_beta_prod.json
@@ -1,5 +1,24 @@
 [
   {
+    "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
diff --git a/recipes/packaging/packaging.expected/mac_refs_heads_beta_staging.json b/recipes/packaging/packaging.expected/mac_refs_heads_beta_staging.json
index b195338..16d3206 100644
--- a/recipes/packaging/packaging.expected/mac_refs_heads_beta_staging.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_beta_staging.json
@@ -1,5 +1,24 @@
 [
   {
+    "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:staging"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
diff --git a/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_experimental_flutter.json b/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_experimental_flutter.json
index d3c7fe8..a7a2f28 100644
--- a/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_experimental_flutter.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_experimental_flutter.json
@@ -1,6 +1,25 @@
 [
   {
     "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
+    "cmd": [
       "cipd",
       "ensure",
       "-root",
diff --git a/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_experimental_prod.json b/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_experimental_prod.json
index 3990d88..7b41de4 100644
--- a/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_experimental_prod.json
@@ -1,5 +1,24 @@
 [
   {
+    "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
diff --git a/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_experimental_staging.json b/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_experimental_staging.json
index d56fdca..54b3e73 100644
--- a/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_experimental_staging.json
@@ -1,5 +1,24 @@
 [
   {
+    "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:staging"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
diff --git a/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_flutter.json b/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_flutter.json
index 5db8aa3..562ec74 100644
--- a/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_flutter.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_flutter.json
@@ -1,6 +1,25 @@
 [
   {
     "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
+    "cmd": [
       "cipd",
       "ensure",
       "-root",
diff --git a/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_prod.json b/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_prod.json
index 19a70ec..3aefa0c 100644
--- a/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_prod.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_prod.json
@@ -1,5 +1,24 @@
 [
   {
+    "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
diff --git a/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_staging.json b/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_staging.json
index 5106a51..b4ef772 100644
--- a/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_staging.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_staging.json
@@ -1,5 +1,24 @@
 [
   {
+    "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:staging"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
diff --git a/recipes/packaging/packaging.expected/mac_refs_heads_master_experimental_flutter.json b/recipes/packaging/packaging.expected/mac_refs_heads_master_experimental_flutter.json
index 3561f7a..78de6eb 100644
--- a/recipes/packaging/packaging.expected/mac_refs_heads_master_experimental_flutter.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_master_experimental_flutter.json
@@ -1,6 +1,25 @@
 [
   {
     "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
+    "cmd": [
       "cipd",
       "ensure",
       "-root",
diff --git a/recipes/packaging/packaging.expected/mac_refs_heads_master_experimental_prod.json b/recipes/packaging/packaging.expected/mac_refs_heads_master_experimental_prod.json
index 6c65fce..f19edaf 100644
--- a/recipes/packaging/packaging.expected/mac_refs_heads_master_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_master_experimental_prod.json
@@ -1,5 +1,24 @@
 [
   {
+    "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
diff --git a/recipes/packaging/packaging.expected/mac_refs_heads_master_experimental_staging.json b/recipes/packaging/packaging.expected/mac_refs_heads_master_experimental_staging.json
index ccd0995..0d50b83 100644
--- a/recipes/packaging/packaging.expected/mac_refs_heads_master_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_master_experimental_staging.json
@@ -1,5 +1,24 @@
 [
   {
+    "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:staging"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
diff --git a/recipes/packaging/packaging.expected/mac_refs_heads_master_flutter.json b/recipes/packaging/packaging.expected/mac_refs_heads_master_flutter.json
index 7d4b8fd..fb9d771 100644
--- a/recipes/packaging/packaging.expected/mac_refs_heads_master_flutter.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_master_flutter.json
@@ -1,6 +1,25 @@
 [
   {
     "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
+    "cmd": [
       "cipd",
       "ensure",
       "-root",
diff --git a/recipes/packaging/packaging.expected/mac_refs_heads_master_prod.json b/recipes/packaging/packaging.expected/mac_refs_heads_master_prod.json
index 826cf4b..0125f59 100644
--- a/recipes/packaging/packaging.expected/mac_refs_heads_master_prod.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_master_prod.json
@@ -1,5 +1,24 @@
 [
   {
+    "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
diff --git a/recipes/packaging/packaging.expected/mac_refs_heads_master_staging.json b/recipes/packaging/packaging.expected/mac_refs_heads_master_staging.json
index d25be9e..533b5f0 100644
--- a/recipes/packaging/packaging.expected/mac_refs_heads_master_staging.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_master_staging.json
@@ -1,5 +1,24 @@
 [
   {
+    "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:staging"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
diff --git a/recipes/packaging/packaging.expected/mac_refs_heads_stable_experimental_flutter.json b/recipes/packaging/packaging.expected/mac_refs_heads_stable_experimental_flutter.json
index 0047630..253118f 100644
--- a/recipes/packaging/packaging.expected/mac_refs_heads_stable_experimental_flutter.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_stable_experimental_flutter.json
@@ -1,6 +1,25 @@
 [
   {
     "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
+    "cmd": [
       "cipd",
       "ensure",
       "-root",
diff --git a/recipes/packaging/packaging.expected/mac_refs_heads_stable_experimental_prod.json b/recipes/packaging/packaging.expected/mac_refs_heads_stable_experimental_prod.json
index eeed767..b67cf64 100644
--- a/recipes/packaging/packaging.expected/mac_refs_heads_stable_experimental_prod.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_stable_experimental_prod.json
@@ -1,5 +1,24 @@
 [
   {
+    "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
diff --git a/recipes/packaging/packaging.expected/mac_refs_heads_stable_experimental_staging.json b/recipes/packaging/packaging.expected/mac_refs_heads_stable_experimental_staging.json
index 38f2762..569a5cb 100644
--- a/recipes/packaging/packaging.expected/mac_refs_heads_stable_experimental_staging.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_stable_experimental_staging.json
@@ -1,5 +1,24 @@
 [
   {
+    "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:staging"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
diff --git a/recipes/packaging/packaging.expected/mac_refs_heads_stable_flutter.json b/recipes/packaging/packaging.expected/mac_refs_heads_stable_flutter.json
index 9b3fa96..401df10 100644
--- a/recipes/packaging/packaging.expected/mac_refs_heads_stable_flutter.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_stable_flutter.json
@@ -1,6 +1,25 @@
 [
   {
     "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:flutter"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
+    "cmd": [
       "cipd",
       "ensure",
       "-root",
diff --git a/recipes/packaging/packaging.expected/mac_refs_heads_stable_prod.json b/recipes/packaging/packaging.expected/mac_refs_heads_stable_prod.json
index 3ad149d..e1d527b 100644
--- a/recipes/packaging/packaging.expected/mac_refs_heads_stable_prod.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_stable_prod.json
@@ -1,5 +1,24 @@
 [
   {
+    "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:prod"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },
diff --git a/recipes/packaging/packaging.expected/mac_refs_heads_stable_staging.json b/recipes/packaging/packaging.expected/mac_refs_heads_stable_staging.json
index be543ca..8b568a5 100644
--- a/recipes/packaging/packaging.expected/mac_refs_heads_stable_staging.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_stable_staging.json
@@ -1,5 +1,24 @@
 [
   {
+    "cmd": [
+      "sw_vers",
+      "-productVersion"
+    ],
+    "luci_context": {
+      "realm": {
+        "name": "project:staging"
+      },
+      "resultdb": {
+        "current_invocation": {
+          "name": "invocations/build:8945511751514863184",
+          "update_token": "token"
+        },
+        "hostname": "rdbhost"
+      }
+    },
+    "name": "find macOS version"
+  },
+  {
     "cmd": [],
     "name": "determine release revision"
   },