diff --git a/recipe_modules/bucket_util/api.py b/recipe_modules/bucket_util/api.py
index acdfd1b..f2e9071 100644
--- a/recipe_modules/bucket_util/api.py
+++ b/recipe_modules/bucket_util/api.py
@@ -4,12 +4,12 @@
 
 from recipe_engine import recipe_api
 
-
 # TODO(godofredoc): Remove when flutter tool branches to stable.
 # https://github.com/flutter/flutter/issues/75363.
 OLD_INFRA_BUCKET_NAME = 'flutter_infra'
 NEW_INFRA_BUCKET_NAME = 'flutter_infra_release'
 
+
 class BucketUtilApi(recipe_api.RecipeApi):
   """Utility functions to upload files to cloud buckets.
 
@@ -22,13 +22,15 @@
   def should_upload_packages(self):
     return self.m.properties.get('upload_packages', False)
 
-  def upload_folder(self,
-                    dir_label,
-                    parent_directory,
-                    folder_name,
-                    zip_name,
-                    platform=None,
-                    bucket_name=NEW_INFRA_BUCKET_NAME):
+  def upload_folder(
+      self,
+      dir_label,
+      parent_directory,
+      folder_name,
+      zip_name,
+      platform=None,
+      bucket_name=NEW_INFRA_BUCKET_NAME
+  ):
     """Uploads a folder to the cloud bucket
 
     Args:
@@ -39,21 +41,25 @@
       platform: (str) Directory name to add the zip file to.
       bucket_name: (str) The bucket name. Defaults to flutter_infra.
     """
-    self.upload_folder_and_files(dir_label,
-                                 parent_directory,
-                                 folder_name,
-                                 zip_name,
-                                 platform=platform,
-                                 bucket_name=bucket_name)
+    self.upload_folder_and_files(
+        dir_label,
+        parent_directory,
+        folder_name,
+        zip_name,
+        platform=platform,
+        bucket_name=bucket_name
+    )
 
-  def upload_folder_and_files(self,
-                              dir_label,
-                              parent_directory,
-                              folder_name,
-                              zip_name,
-                              platform=None,
-                              file_paths=None,
-                              bucket_name=NEW_INFRA_BUCKET_NAME):
+  def upload_folder_and_files(
+      self,
+      dir_label,
+      parent_directory,
+      folder_name,
+      zip_name,
+      platform=None,
+      file_paths=None,
+      bucket_name=NEW_INFRA_BUCKET_NAME
+  ):
     """Uploads a folder and or files to the cloud bucket
 
     Args:
@@ -80,12 +86,14 @@
       if self.should_upload_packages():
         self.safe_upload(local_zip, remote_zip, bucket_name=bucket_name)
 
-  def safe_upload(self,
-                  local_path,
-                  remote_path,
-                  bucket_name=NEW_INFRA_BUCKET_NAME,
-                  args=[],
-                  skip_on_duplicate=False):
+  def safe_upload(
+      self,
+      local_path,
+      remote_path,
+      bucket_name=NEW_INFRA_BUCKET_NAME,
+      args=[],
+      skip_on_duplicate=False
+  ):
     """Upload a file if it doesn't already exist, fail job otherwise.
 
     The check can be overridden with the `force_upload` property.
@@ -109,13 +117,15 @@
     if not experimental and not force_upload:
       cloud_path = 'gs://%s/%s' % (bucket_name, remote_path)
       result = self.m.step(
-          'Ensure %s does not already exist on cloud storage' % remote_path, [
+          'Ensure %s does not already exist on cloud storage' % remote_path,
+          [
               'python',
               self.m.depot_tools.gsutil_py_path,
               'stat',
               cloud_path,
           ],
-          ok_ret='all')
+          ok_ret='all',
+      )
       # A return value of 0 means the file ALREADY exists on cloud storage
       if result.exc_result.retcode == 0:
         if skip_on_duplicate:
@@ -123,20 +133,21 @@
           return
         raise AssertionError('%s already exists on cloud storage' % cloud_path)
 
-    
     if bucket_name == NEW_INFRA_BUCKET_NAME:
       self.m.gsutil.upload(
-         local_path,
-         OLD_INFRA_BUCKET_NAME,
-         remote_path,
-         args=args,
-         name='upload "%s"' % remote_path)
+          local_path,
+          OLD_INFRA_BUCKET_NAME,
+          remote_path,
+          args=args,
+          name='upload "%s"' % remote_path
+      )
     return self.m.gsutil.upload(
         local_path,
         bucket_name,
         remote_path,
         args=args,
-        name='upload "%s"' % remote_path)
+        name='upload "%s"' % remote_path
+    )
 
   def add_files(self, pkg, relative_paths=[]):
     """Adds files to the package.
@@ -152,8 +163,7 @@
         destination filename in the archive.
     """
     for path in relative_paths:
-      pkg.add_file(pkg.root.join(path),
-                   archive_name=self.m.path.basename(path))
+      pkg.add_file(pkg.root.join(path), archive_name=self.m.path.basename(path))
 
   def add_directories(self, pkg, relative_paths=[]):
     """Adds directories to the package.
diff --git a/recipe_modules/bucket_util/examples/full.expected/upload_packages_tiggers_exception_and_package_exists.json b/recipe_modules/bucket_util/examples/full.expected/upload_packages_tiggers_exception_and_package_exists.json
index 9f8a956..2ad5073 100644
--- a/recipe_modules/bucket_util/examples/full.expected/upload_packages_tiggers_exception_and_package_exists.json
+++ b/recipe_modules/bucket_util/examples/full.expected/upload_packages_tiggers_exception_and_package_exists.json
@@ -40,11 +40,11 @@
       "Traceback (most recent call last):",
       "  File \"RECIPE_REPO[flutter]/recipe_modules/bucket_util/examples/full.py\", line 22, in RunSteps",
       "    'test1.zip') # zip_name",
-      "  File \"RECIPE_REPO[flutter]/recipe_modules/bucket_util/api.py\", line 47, in upload_folder",
-      "    bucket_name=bucket_name)",
-      "  File \"RECIPE_REPO[flutter]/recipe_modules/bucket_util/api.py\", line 81, in upload_folder_and_files",
+      "  File \"RECIPE_REPO[flutter]/recipe_modules/bucket_util/api.py\", line 50, in upload_folder",
+      "    bucket_name=bucket_name",
+      "  File \"RECIPE_REPO[flutter]/recipe_modules/bucket_util/api.py\", line 87, in upload_folder_and_files",
       "    self.safe_upload(local_zip, remote_zip, bucket_name=bucket_name)",
-      "  File \"RECIPE_REPO[flutter]/recipe_modules/bucket_util/api.py\", line 124, in safe_upload",
+      "  File \"RECIPE_REPO[flutter]/recipe_modules/bucket_util/api.py\", line 134, in safe_upload",
       "    raise AssertionError('%s already exists on cloud storage' % cloud_path)",
       "AssertionError: gs://flutter_infra_release/flutter/00000000-0000-0000-0000-000000001337/test1.zip already exists on cloud storage"
     ]
diff --git a/recipe_modules/os_utils/api.py b/recipe_modules/os_utils/api.py
index 7b71791..e9a7fbd 100644
--- a/recipe_modules/os_utils/api.py
+++ b/recipe_modules/os_utils/api.py
@@ -19,9 +19,9 @@
       exe_name(str): The name of the windows executable.
     """
     self.m.step(
-        name, ['taskkill', '/f', '/im', exe_name, '/t'],
+        name,
+        ['taskkill', '/f', '/im', exe_name, '/t'],
         ok_ret='any',
-        infra_step=True
     )
 
   def clean_derived_data(self):
@@ -35,7 +35,11 @@
         'Library', 'Developer', 'Xcode', 'DerivedData'
     )
     if self.m.platform.is_mac:
-      self.m.step('Delete mac deriveddata', ['rm', '-rf', derived_data_path])
+      self.m.step(
+          'Delete mac deriveddata',
+          ['rm', '-rf', derived_data_path],
+          infra_step=True,
+      )
 
   def collect_os_info(self):
     """Collects meminfo, cpu, processes for mac"""
diff --git a/recipe_modules/os_utils/examples/full.expected/basic.json b/recipe_modules/os_utils/examples/full.expected/basic.json
index 01c80a1..cc4fb47 100644
--- a/recipe_modules/os_utils/examples/full.expected/basic.json
+++ b/recipe_modules/os_utils/examples/full.expected/basic.json
@@ -11,7 +11,6 @@
       "java.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -25,7 +24,6 @@
       "dart.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -39,7 +37,6 @@
       "adb.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -53,7 +50,6 @@
       "flutter_tester.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipe_modules/os_utils/examples/full.expected/clean_derived_data.json b/recipe_modules/os_utils/examples/full.expected/clean_derived_data.json
index 6aa91fa..a443598 100644
--- a/recipe_modules/os_utils/examples/full.expected/clean_derived_data.json
+++ b/recipe_modules/os_utils/examples/full.expected/clean_derived_data.json
@@ -121,6 +121,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
diff --git a/recipe_modules/os_utils/examples/full.expected/mac_linux.json b/recipe_modules/os_utils/examples/full.expected/mac_linux.json
index 5748295..1b6d5e0 100644
--- a/recipe_modules/os_utils/examples/full.expected/mac_linux.json
+++ b/recipe_modules/os_utils/examples/full.expected/mac_linux.json
@@ -121,6 +121,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
diff --git a/recipe_modules/os_utils/examples/full.expected/with_failures.json b/recipe_modules/os_utils/examples/full.expected/with_failures.json
index 01c80a1..cc4fb47 100644
--- a/recipe_modules/os_utils/examples/full.expected/with_failures.json
+++ b/recipe_modules/os_utils/examples/full.expected/with_failures.json
@@ -11,7 +11,6 @@
       "java.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -25,7 +24,6 @@
       "dart.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -39,7 +37,6 @@
       "adb.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -53,7 +50,6 @@
       "flutter_tester.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipe_modules/osx_sdk/api.py b/recipe_modules/osx_sdk/api.py
index 33a10d5..f352200 100644
--- a/recipe_modules/osx_sdk/api.py
+++ b/recipe_modules/osx_sdk/api.py
@@ -133,7 +133,8 @@
 
     sdk_app = cache_dir.join('XCode.app')
     self.m.step(
-        'install xcode', [
+        'install xcode',
+        [
             cache_dir.join('mac_toolchain'),
             'install',
             '-kind',
@@ -144,6 +145,6 @@
             sdk_app,
             '-cipd-package-prefix',
             'flutter_internal/ios/xcode',
-        ]
+        ],
     )
     return sdk_app
diff --git a/recipes/engine.expected/Linux Fuchsia failing test.json b/recipes/engine.expected/Linux Fuchsia failing test.json
index 72b6f48..b64165f 100644
--- a/recipes/engine.expected/Linux Fuchsia failing test.json
+++ b/recipes/engine.expected/Linux Fuchsia failing test.json
@@ -4997,6 +4997,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "android lint.pub get",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine.expected/Linux Fuchsia skips on duplicate.json b/recipes/engine.expected/Linux Fuchsia skips on duplicate.json
index f0500d2..5a36a9e 100644
--- a/recipes/engine.expected/Linux Fuchsia skips on duplicate.json
+++ b/recipes/engine.expected/Linux Fuchsia skips on duplicate.json
@@ -5294,6 +5294,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "android lint.pub get",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -20062,6 +20063,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "pub get for verify_exported.dart"
   },
   {
diff --git a/recipes/engine.expected/clobber.json b/recipes/engine.expected/clobber.json
index a1e7300..cf62151 100644
--- a/recipes/engine.expected/clobber.json
+++ b/recipes/engine.expected/clobber.json
@@ -4207,6 +4207,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "android lint.pub get",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -15157,6 +15158,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "pub get for verify_exported.dart"
   },
   {
diff --git a/recipes/engine.expected/experimental.json b/recipes/engine.expected/experimental.json
index 92cc0bf..e396425 100644
--- a/recipes/engine.expected/experimental.json
+++ b/recipes/engine.expected/experimental.json
@@ -4205,6 +4205,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "android lint.pub get",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -15147,6 +15148,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "pub get for verify_exported.dart"
   },
   {
diff --git a/recipes/engine.expected/experimental_upload.json b/recipes/engine.expected/experimental_upload.json
index d228bdd..13bdd2a 100644
--- a/recipes/engine.expected/experimental_upload.json
+++ b/recipes/engine.expected/experimental_upload.json
@@ -4997,6 +4997,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "android lint.pub get",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -19261,6 +19262,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "pub get for verify_exported.dart"
   },
   {
diff --git a/recipes/engine.expected/first_bot_update_failed.json b/recipes/engine.expected/first_bot_update_failed.json
index 837cf6e..ad6d339 100644
--- a/recipes/engine.expected/first_bot_update_failed.json
+++ b/recipes/engine.expected/first_bot_update_failed.json
@@ -4370,6 +4370,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "android lint.pub get",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -15320,6 +15321,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "pub get for verify_exported.dart"
   },
   {
diff --git a/recipes/engine.expected/gcloud_pubsub_failure.json b/recipes/engine.expected/gcloud_pubsub_failure.json
index c346471..444d47a 100644
--- a/recipes/engine.expected/gcloud_pubsub_failure.json
+++ b/recipes/engine.expected/gcloud_pubsub_failure.json
@@ -4207,6 +4207,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "android lint.pub get",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -15157,6 +15158,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "pub get for verify_exported.dart"
   },
   {
diff --git a/recipes/engine.expected/linux.json b/recipes/engine.expected/linux.json
index 89ecd93..c615550 100644
--- a/recipes/engine.expected/linux.json
+++ b/recipes/engine.expected/linux.json
@@ -4205,6 +4205,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "android lint.pub get",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -15147,6 +15148,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "pub get for verify_exported.dart"
   },
   {
diff --git a/recipes/engine.expected/linux_maven_or_bitcode.json b/recipes/engine.expected/linux_maven_or_bitcode.json
index 89ecd93..c615550 100644
--- a/recipes/engine.expected/linux_maven_or_bitcode.json
+++ b/recipes/engine.expected/linux_maven_or_bitcode.json
@@ -4205,6 +4205,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "android lint.pub get",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -15147,6 +15148,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "pub get for verify_exported.dart"
   },
   {
diff --git a/recipes/engine.expected/linux_maven_or_bitcode_no_lto.json b/recipes/engine.expected/linux_maven_or_bitcode_no_lto.json
index 1a141bd..ab71be1 100644
--- a/recipes/engine.expected/linux_maven_or_bitcode_no_lto.json
+++ b/recipes/engine.expected/linux_maven_or_bitcode_no_lto.json
@@ -4211,6 +4211,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "android lint.pub get",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -15162,6 +15163,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "pub get for verify_exported.dart"
   },
   {
diff --git a/recipes/engine.expected/linux_maven_or_bitcode_publish_cipd.json b/recipes/engine.expected/linux_maven_or_bitcode_publish_cipd.json
index 89ecd93..c615550 100644
--- a/recipes/engine.expected/linux_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine.expected/linux_maven_or_bitcode_publish_cipd.json
@@ -4205,6 +4205,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "android lint.pub get",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -15147,6 +15148,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "pub get for verify_exported.dart"
   },
   {
diff --git a/recipes/engine.expected/linux_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine.expected/linux_maven_or_bitcode_publish_cipd_no_lto.json
index 1a141bd..ab71be1 100644
--- a/recipes/engine.expected/linux_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/linux_maven_or_bitcode_publish_cipd_no_lto.json
@@ -4211,6 +4211,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "android lint.pub get",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -15162,6 +15163,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "pub get for verify_exported.dart"
   },
   {
diff --git a/recipes/engine.expected/linux_no_lto.json b/recipes/engine.expected/linux_no_lto.json
index 1a141bd..ab71be1 100644
--- a/recipes/engine.expected/linux_no_lto.json
+++ b/recipes/engine.expected/linux_no_lto.json
@@ -4211,6 +4211,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "android lint.pub get",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -15162,6 +15163,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "pub get for verify_exported.dart"
   },
   {
diff --git a/recipes/engine.expected/linux_publish_cipd.json b/recipes/engine.expected/linux_publish_cipd.json
index 89ecd93..c615550 100644
--- a/recipes/engine.expected/linux_publish_cipd.json
+++ b/recipes/engine.expected/linux_publish_cipd.json
@@ -4205,6 +4205,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "android lint.pub get",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -15147,6 +15148,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "pub get for verify_exported.dart"
   },
   {
diff --git a/recipes/engine.expected/linux_publish_cipd_no_lto.json b/recipes/engine.expected/linux_publish_cipd_no_lto.json
index 1a141bd..ab71be1 100644
--- a/recipes/engine.expected/linux_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/linux_publish_cipd_no_lto.json
@@ -4211,6 +4211,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "android lint.pub get",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -15162,6 +15163,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "pub get for verify_exported.dart"
   },
   {
diff --git a/recipes/engine.expected/linux_upload.json b/recipes/engine.expected/linux_upload.json
index a891cd7..db6517b 100644
--- a/recipes/engine.expected/linux_upload.json
+++ b/recipes/engine.expected/linux_upload.json
@@ -4997,6 +4997,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "android lint.pub get",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -19409,6 +19410,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "pub get for verify_exported.dart"
   },
   {
diff --git a/recipes/engine.expected/linux_upload_maven_or_bitcode.json b/recipes/engine.expected/linux_upload_maven_or_bitcode.json
index 5806dee..5af63fb 100644
--- a/recipes/engine.expected/linux_upload_maven_or_bitcode.json
+++ b/recipes/engine.expected/linux_upload_maven_or_bitcode.json
@@ -4997,6 +4997,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "android lint.pub get",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -18365,6 +18366,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "pub get for verify_exported.dart"
   },
   {
diff --git a/recipes/engine.expected/linux_upload_maven_or_bitcode_no_lto.json b/recipes/engine.expected/linux_upload_maven_or_bitcode_no_lto.json
index 65dff2d..5efc6cb 100644
--- a/recipes/engine.expected/linux_upload_maven_or_bitcode_no_lto.json
+++ b/recipes/engine.expected/linux_upload_maven_or_bitcode_no_lto.json
@@ -5003,6 +5003,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "android lint.pub get",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -18380,6 +18381,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "pub get for verify_exported.dart"
   },
   {
diff --git a/recipes/engine.expected/linux_upload_maven_or_bitcode_publish_cipd.json b/recipes/engine.expected/linux_upload_maven_or_bitcode_publish_cipd.json
index e1f8583..df1a556 100644
--- a/recipes/engine.expected/linux_upload_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine.expected/linux_upload_maven_or_bitcode_publish_cipd.json
@@ -4997,6 +4997,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "android lint.pub get",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -19003,6 +19004,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "pub get for verify_exported.dart"
   },
   {
diff --git a/recipes/engine.expected/linux_upload_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine.expected/linux_upload_maven_or_bitcode_publish_cipd_no_lto.json
index d0a013c..3577112 100644
--- a/recipes/engine.expected/linux_upload_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/linux_upload_maven_or_bitcode_publish_cipd_no_lto.json
@@ -5003,6 +5003,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "android lint.pub get",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -19018,6 +19019,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "pub get for verify_exported.dart"
   },
   {
diff --git a/recipes/engine.expected/linux_upload_no_lto.json b/recipes/engine.expected/linux_upload_no_lto.json
index a552c7a..7c31841 100644
--- a/recipes/engine.expected/linux_upload_no_lto.json
+++ b/recipes/engine.expected/linux_upload_no_lto.json
@@ -5003,6 +5003,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "android lint.pub get",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -19424,6 +19425,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "pub get for verify_exported.dart"
   },
   {
diff --git a/recipes/engine.expected/linux_upload_publish_cipd.json b/recipes/engine.expected/linux_upload_publish_cipd.json
index 92ebe31..5587795 100644
--- a/recipes/engine.expected/linux_upload_publish_cipd.json
+++ b/recipes/engine.expected/linux_upload_publish_cipd.json
@@ -4997,6 +4997,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "android lint.pub get",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -20047,6 +20048,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "pub get for verify_exported.dart"
   },
   {
diff --git a/recipes/engine.expected/linux_upload_publish_cipd_no_lto.json b/recipes/engine.expected/linux_upload_publish_cipd_no_lto.json
index dc3b86a..ce4aab0 100644
--- a/recipes/engine.expected/linux_upload_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/linux_upload_publish_cipd_no_lto.json
@@ -5003,6 +5003,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "android lint.pub get",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -20062,6 +20063,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "pub get for verify_exported.dart"
   },
   {
diff --git a/recipes/engine.expected/mac.json b/recipes/engine.expected/mac.json
index a6c57db..5be6fdf 100644
--- a/recipes/engine.expected/mac.json
+++ b/recipes/engine.expected/mac.json
@@ -246,6 +246,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
@@ -9864,6 +9865,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "pub get for verify_exported.dart"
   },
   {
diff --git a/recipes/engine.expected/mac_maven_or_bitcode.json b/recipes/engine.expected/mac_maven_or_bitcode.json
index acd0515..7bf6d3f 100644
--- a/recipes/engine.expected/mac_maven_or_bitcode.json
+++ b/recipes/engine.expected/mac_maven_or_bitcode.json
@@ -246,6 +246,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
@@ -11554,6 +11555,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "pub get for verify_exported.dart"
   },
   {
diff --git a/recipes/engine.expected/mac_maven_or_bitcode_no_lto.json b/recipes/engine.expected/mac_maven_or_bitcode_no_lto.json
index f394dd1..61aaf8a 100644
--- a/recipes/engine.expected/mac_maven_or_bitcode_no_lto.json
+++ b/recipes/engine.expected/mac_maven_or_bitcode_no_lto.json
@@ -246,6 +246,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
@@ -11568,6 +11569,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "pub get for verify_exported.dart"
   },
   {
diff --git a/recipes/engine.expected/mac_maven_or_bitcode_publish_cipd.json b/recipes/engine.expected/mac_maven_or_bitcode_publish_cipd.json
index acd0515..7bf6d3f 100644
--- a/recipes/engine.expected/mac_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine.expected/mac_maven_or_bitcode_publish_cipd.json
@@ -246,6 +246,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
@@ -11554,6 +11555,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "pub get for verify_exported.dart"
   },
   {
diff --git a/recipes/engine.expected/mac_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine.expected/mac_maven_or_bitcode_publish_cipd_no_lto.json
index f394dd1..61aaf8a 100644
--- a/recipes/engine.expected/mac_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/mac_maven_or_bitcode_publish_cipd_no_lto.json
@@ -246,6 +246,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
@@ -11568,6 +11569,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "pub get for verify_exported.dart"
   },
   {
diff --git a/recipes/engine.expected/mac_no_lto.json b/recipes/engine.expected/mac_no_lto.json
index 563579a..be49b98 100644
--- a/recipes/engine.expected/mac_no_lto.json
+++ b/recipes/engine.expected/mac_no_lto.json
@@ -246,6 +246,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
@@ -9878,6 +9879,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "pub get for verify_exported.dart"
   },
   {
diff --git a/recipes/engine.expected/mac_publish_cipd.json b/recipes/engine.expected/mac_publish_cipd.json
index a6c57db..5be6fdf 100644
--- a/recipes/engine.expected/mac_publish_cipd.json
+++ b/recipes/engine.expected/mac_publish_cipd.json
@@ -246,6 +246,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
@@ -9864,6 +9865,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "pub get for verify_exported.dart"
   },
   {
diff --git a/recipes/engine.expected/mac_publish_cipd_no_lto.json b/recipes/engine.expected/mac_publish_cipd_no_lto.json
index 563579a..be49b98 100644
--- a/recipes/engine.expected/mac_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/mac_publish_cipd_no_lto.json
@@ -246,6 +246,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
@@ -9878,6 +9879,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "pub get for verify_exported.dart"
   },
   {
diff --git a/recipes/engine.expected/mac_upload.json b/recipes/engine.expected/mac_upload.json
index ef0fcf2..fed6d2b 100644
--- a/recipes/engine.expected/mac_upload.json
+++ b/recipes/engine.expected/mac_upload.json
@@ -246,6 +246,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
@@ -11768,6 +11769,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "pub get for verify_exported.dart"
   },
   {
diff --git a/recipes/engine.expected/mac_upload_maven_or_bitcode.json b/recipes/engine.expected/mac_upload_maven_or_bitcode.json
index 779d17d..c06712f 100644
--- a/recipes/engine.expected/mac_upload_maven_or_bitcode.json
+++ b/recipes/engine.expected/mac_upload_maven_or_bitcode.json
@@ -246,6 +246,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
@@ -13306,6 +13307,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "pub get for verify_exported.dart"
   },
   {
diff --git a/recipes/engine.expected/mac_upload_maven_or_bitcode_no_lto.json b/recipes/engine.expected/mac_upload_maven_or_bitcode_no_lto.json
index eec1e32..cb95551 100644
--- a/recipes/engine.expected/mac_upload_maven_or_bitcode_no_lto.json
+++ b/recipes/engine.expected/mac_upload_maven_or_bitcode_no_lto.json
@@ -246,6 +246,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
@@ -13320,6 +13321,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "pub get for verify_exported.dart"
   },
   {
diff --git a/recipes/engine.expected/mac_upload_maven_or_bitcode_publish_cipd.json b/recipes/engine.expected/mac_upload_maven_or_bitcode_publish_cipd.json
index 779d17d..c06712f 100644
--- a/recipes/engine.expected/mac_upload_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine.expected/mac_upload_maven_or_bitcode_publish_cipd.json
@@ -246,6 +246,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
@@ -13306,6 +13307,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "pub get for verify_exported.dart"
   },
   {
diff --git a/recipes/engine.expected/mac_upload_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine.expected/mac_upload_maven_or_bitcode_publish_cipd_no_lto.json
index eec1e32..cb95551 100644
--- a/recipes/engine.expected/mac_upload_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/mac_upload_maven_or_bitcode_publish_cipd_no_lto.json
@@ -246,6 +246,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
@@ -13320,6 +13321,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "pub get for verify_exported.dart"
   },
   {
diff --git a/recipes/engine.expected/mac_upload_no_lto.json b/recipes/engine.expected/mac_upload_no_lto.json
index 37bcef3..2995578 100644
--- a/recipes/engine.expected/mac_upload_no_lto.json
+++ b/recipes/engine.expected/mac_upload_no_lto.json
@@ -246,6 +246,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
@@ -11782,6 +11783,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "pub get for verify_exported.dart"
   },
   {
diff --git a/recipes/engine.expected/mac_upload_publish_cipd.json b/recipes/engine.expected/mac_upload_publish_cipd.json
index ef0fcf2..fed6d2b 100644
--- a/recipes/engine.expected/mac_upload_publish_cipd.json
+++ b/recipes/engine.expected/mac_upload_publish_cipd.json
@@ -246,6 +246,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
@@ -11768,6 +11769,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "pub get for verify_exported.dart"
   },
   {
diff --git a/recipes/engine.expected/mac_upload_publish_cipd_no_lto.json b/recipes/engine.expected/mac_upload_publish_cipd_no_lto.json
index 37bcef3..2995578 100644
--- a/recipes/engine.expected/mac_upload_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/mac_upload_publish_cipd_no_lto.json
@@ -246,6 +246,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
@@ -11782,6 +11783,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "pub get for verify_exported.dart"
   },
   {
diff --git a/recipes/engine.expected/pull_request.json b/recipes/engine.expected/pull_request.json
index a1e7300..cf62151 100644
--- a/recipes/engine.expected/pull_request.json
+++ b/recipes/engine.expected/pull_request.json
@@ -4207,6 +4207,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "android lint.pub get",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -15157,6 +15158,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
+    "infra_step": true,
     "name": "pub get for verify_exported.dart"
   },
   {
diff --git a/recipes/engine.expected/win.json b/recipes/engine.expected/win.json
index f78bc6a..7ddef33 100644
--- a/recipes/engine.expected/win.json
+++ b/recipes/engine.expected/win.json
@@ -5385,7 +5385,6 @@
       "java.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5399,7 +5398,6 @@
       "dart.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5413,7 +5411,6 @@
       "adb.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5427,7 +5424,6 @@
       "flutter_tester.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine.expected/win_maven_or_bitcode.json b/recipes/engine.expected/win_maven_or_bitcode.json
index f78bc6a..7ddef33 100644
--- a/recipes/engine.expected/win_maven_or_bitcode.json
+++ b/recipes/engine.expected/win_maven_or_bitcode.json
@@ -5385,7 +5385,6 @@
       "java.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5399,7 +5398,6 @@
       "dart.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5413,7 +5411,6 @@
       "adb.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5427,7 +5424,6 @@
       "flutter_tester.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine.expected/win_maven_or_bitcode_no_lto.json b/recipes/engine.expected/win_maven_or_bitcode_no_lto.json
index f02f00f..fd1ef5a 100644
--- a/recipes/engine.expected/win_maven_or_bitcode_no_lto.json
+++ b/recipes/engine.expected/win_maven_or_bitcode_no_lto.json
@@ -5392,7 +5392,6 @@
       "java.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5406,7 +5405,6 @@
       "dart.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5420,7 +5418,6 @@
       "adb.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5434,7 +5431,6 @@
       "flutter_tester.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine.expected/win_maven_or_bitcode_publish_cipd.json b/recipes/engine.expected/win_maven_or_bitcode_publish_cipd.json
index f78bc6a..7ddef33 100644
--- a/recipes/engine.expected/win_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine.expected/win_maven_or_bitcode_publish_cipd.json
@@ -5385,7 +5385,6 @@
       "java.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5399,7 +5398,6 @@
       "dart.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5413,7 +5411,6 @@
       "adb.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5427,7 +5424,6 @@
       "flutter_tester.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine.expected/win_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine.expected/win_maven_or_bitcode_publish_cipd_no_lto.json
index f02f00f..fd1ef5a 100644
--- a/recipes/engine.expected/win_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/win_maven_or_bitcode_publish_cipd_no_lto.json
@@ -5392,7 +5392,6 @@
       "java.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5406,7 +5405,6 @@
       "dart.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5420,7 +5418,6 @@
       "adb.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5434,7 +5431,6 @@
       "flutter_tester.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine.expected/win_no_lto.json b/recipes/engine.expected/win_no_lto.json
index f02f00f..fd1ef5a 100644
--- a/recipes/engine.expected/win_no_lto.json
+++ b/recipes/engine.expected/win_no_lto.json
@@ -5392,7 +5392,6 @@
       "java.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5406,7 +5405,6 @@
       "dart.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5420,7 +5418,6 @@
       "adb.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5434,7 +5431,6 @@
       "flutter_tester.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine.expected/win_publish_cipd.json b/recipes/engine.expected/win_publish_cipd.json
index f78bc6a..7ddef33 100644
--- a/recipes/engine.expected/win_publish_cipd.json
+++ b/recipes/engine.expected/win_publish_cipd.json
@@ -5385,7 +5385,6 @@
       "java.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5399,7 +5398,6 @@
       "dart.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5413,7 +5411,6 @@
       "adb.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5427,7 +5424,6 @@
       "flutter_tester.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine.expected/win_publish_cipd_no_lto.json b/recipes/engine.expected/win_publish_cipd_no_lto.json
index f02f00f..fd1ef5a 100644
--- a/recipes/engine.expected/win_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/win_publish_cipd_no_lto.json
@@ -5392,7 +5392,6 @@
       "java.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5406,7 +5405,6 @@
       "dart.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5420,7 +5418,6 @@
       "adb.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5434,7 +5431,6 @@
       "flutter_tester.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine.expected/win_upload.json b/recipes/engine.expected/win_upload.json
index 169e241..91640c0 100644
--- a/recipes/engine.expected/win_upload.json
+++ b/recipes/engine.expected/win_upload.json
@@ -6537,7 +6537,6 @@
       "java.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6551,7 +6550,6 @@
       "dart.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6565,7 +6563,6 @@
       "adb.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6579,7 +6576,6 @@
       "flutter_tester.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine.expected/win_upload_maven_or_bitcode.json b/recipes/engine.expected/win_upload_maven_or_bitcode.json
index 169e241..91640c0 100644
--- a/recipes/engine.expected/win_upload_maven_or_bitcode.json
+++ b/recipes/engine.expected/win_upload_maven_or_bitcode.json
@@ -6537,7 +6537,6 @@
       "java.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6551,7 +6550,6 @@
       "dart.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6565,7 +6563,6 @@
       "adb.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6579,7 +6576,6 @@
       "flutter_tester.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine.expected/win_upload_maven_or_bitcode_no_lto.json b/recipes/engine.expected/win_upload_maven_or_bitcode_no_lto.json
index b418eda..caa8e5d 100644
--- a/recipes/engine.expected/win_upload_maven_or_bitcode_no_lto.json
+++ b/recipes/engine.expected/win_upload_maven_or_bitcode_no_lto.json
@@ -6544,7 +6544,6 @@
       "java.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6558,7 +6557,6 @@
       "dart.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6572,7 +6570,6 @@
       "adb.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6586,7 +6583,6 @@
       "flutter_tester.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine.expected/win_upload_maven_or_bitcode_publish_cipd.json b/recipes/engine.expected/win_upload_maven_or_bitcode_publish_cipd.json
index 169e241..91640c0 100644
--- a/recipes/engine.expected/win_upload_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine.expected/win_upload_maven_or_bitcode_publish_cipd.json
@@ -6537,7 +6537,6 @@
       "java.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6551,7 +6550,6 @@
       "dart.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6565,7 +6563,6 @@
       "adb.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6579,7 +6576,6 @@
       "flutter_tester.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine.expected/win_upload_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine.expected/win_upload_maven_or_bitcode_publish_cipd_no_lto.json
index b418eda..caa8e5d 100644
--- a/recipes/engine.expected/win_upload_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/win_upload_maven_or_bitcode_publish_cipd_no_lto.json
@@ -6544,7 +6544,6 @@
       "java.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6558,7 +6557,6 @@
       "dart.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6572,7 +6570,6 @@
       "adb.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6586,7 +6583,6 @@
       "flutter_tester.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine.expected/win_upload_no_lto.json b/recipes/engine.expected/win_upload_no_lto.json
index b418eda..caa8e5d 100644
--- a/recipes/engine.expected/win_upload_no_lto.json
+++ b/recipes/engine.expected/win_upload_no_lto.json
@@ -6544,7 +6544,6 @@
       "java.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6558,7 +6557,6 @@
       "dart.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6572,7 +6570,6 @@
       "adb.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6586,7 +6583,6 @@
       "flutter_tester.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine.expected/win_upload_publish_cipd.json b/recipes/engine.expected/win_upload_publish_cipd.json
index 169e241..91640c0 100644
--- a/recipes/engine.expected/win_upload_publish_cipd.json
+++ b/recipes/engine.expected/win_upload_publish_cipd.json
@@ -6537,7 +6537,6 @@
       "java.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6551,7 +6550,6 @@
       "dart.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6565,7 +6563,6 @@
       "adb.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6579,7 +6576,6 @@
       "flutter_tester.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine.expected/win_upload_publish_cipd_no_lto.json b/recipes/engine.expected/win_upload_publish_cipd_no_lto.json
index b418eda..caa8e5d 100644
--- a/recipes/engine.expected/win_upload_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/win_upload_publish_cipd_no_lto.json
@@ -6544,7 +6544,6 @@
       "java.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6558,7 +6557,6 @@
       "dart.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6572,7 +6570,6 @@
       "adb.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6586,7 +6583,6 @@
       "flutter_tester.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine.py b/recipes/engine.py
index bb801d9..440d620 100644
--- a/recipes/engine.py
+++ b/recipes/engine.py
@@ -69,8 +69,10 @@
 def GetGitHash(api):
   with api.context(cwd=GetCheckoutPath(api)):
     return api.step(
-        "Retrieve git hash", ["git", "rev-parse", "HEAD"],
-        stdout=api.raw_io.output(), infra_step=True,
+        "Retrieve git hash",
+        ["git", "rev-parse", "HEAD"],
+        stdout=api.raw_io.output(),
+        infra_step=True,
     ).stdout.strip()
 
 
@@ -433,7 +435,11 @@
   script_dir = checkout.join('flutter/testing/symbols')
   script_path = script_dir.join('verify_exported.dart')
   with api.context(cwd=script_dir):
-    api.step('pub get for verify_exported.dart', ['pub', 'get'])
+    api.step(
+        'pub get for verify_exported.dart',
+        ['pub', 'get'],
+        infra_step=True,
+    )
   api.step(
       'Verify exported symbols on release binaries',
       ['dart', script_path, out_dir]
@@ -494,7 +500,11 @@
                                      ).join('flutter', 'tools', 'android_lint')
   with api.step.nest('android lint'):
     with api.context(cwd=android_lint_path):
-      api.step('pub get', ['pub', 'get'])
+      api.step(
+          'pub get',
+          ['pub', 'get'],
+          infra_step=True,
+      )
       api.step('dart bin/main.dart', ['dart', 'bin/main.dart'])
 
 
diff --git a/recipes/engine/engine_arm.expected/mac.json b/recipes/engine/engine_arm.expected/mac.json
index 15300c9..e6a75e6 100644
--- a/recipes/engine/engine_arm.expected/mac.json
+++ b/recipes/engine/engine_arm.expected/mac.json
@@ -236,6 +236,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
diff --git a/recipes/engine/engine_arm.expected/mac_upload.json b/recipes/engine/engine_arm.expected/mac_upload.json
index 15300c9..e6a75e6 100644
--- a/recipes/engine/engine_arm.expected/mac_upload.json
+++ b/recipes/engine/engine_arm.expected/mac_upload.json
@@ -236,6 +236,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
diff --git a/recipes/engine/engine_arm_1_26_0.expected/mac.json b/recipes/engine/engine_arm_1_26_0.expected/mac.json
index 15300c9..e6a75e6 100644
--- a/recipes/engine/engine_arm_1_26_0.expected/mac.json
+++ b/recipes/engine/engine_arm_1_26_0.expected/mac.json
@@ -236,6 +236,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
diff --git a/recipes/engine/engine_arm_1_26_0.expected/mac_upload.json b/recipes/engine/engine_arm_1_26_0.expected/mac_upload.json
index 15300c9..e6a75e6 100644
--- a/recipes/engine/engine_arm_1_26_0.expected/mac_upload.json
+++ b/recipes/engine/engine_arm_1_26_0.expected/mac_upload.json
@@ -236,6 +236,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
diff --git a/recipes/engine/engine_arm_1_27_0.expected/mac.json b/recipes/engine/engine_arm_1_27_0.expected/mac.json
index 15300c9..e6a75e6 100644
--- a/recipes/engine/engine_arm_1_27_0.expected/mac.json
+++ b/recipes/engine/engine_arm_1_27_0.expected/mac.json
@@ -236,6 +236,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
diff --git a/recipes/engine/engine_arm_1_27_0.expected/mac_upload.json b/recipes/engine/engine_arm_1_27_0.expected/mac_upload.json
index 15300c9..e6a75e6 100644
--- a/recipes/engine/engine_arm_1_27_0.expected/mac_upload.json
+++ b/recipes/engine/engine_arm_1_27_0.expected/mac_upload.json
@@ -236,6 +236,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
diff --git a/recipes/engine/web_engine_drone.expected/windows-post-submit.json b/recipes/engine/web_engine_drone.expected/windows-post-submit.json
index f4ce890..a4a400e 100644
--- a/recipes/engine/web_engine_drone.expected/windows-post-submit.json
+++ b/recipes/engine/web_engine_drone.expected/windows-post-submit.json
@@ -419,7 +419,6 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -457,7 +456,6 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -495,7 +493,6 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -533,7 +530,6 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine/web_engine_drone_1_26_0.expected/windows-post-submit.json b/recipes/engine/web_engine_drone_1_26_0.expected/windows-post-submit.json
index 3ca2ede..bbf0fe1 100644
--- a/recipes/engine/web_engine_drone_1_26_0.expected/windows-post-submit.json
+++ b/recipes/engine/web_engine_drone_1_26_0.expected/windows-post-submit.json
@@ -317,7 +317,6 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -353,7 +352,6 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -389,7 +387,6 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -425,7 +422,6 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine/web_engine_drone_1_27_0.expected/windows-post-submit.json b/recipes/engine/web_engine_drone_1_27_0.expected/windows-post-submit.json
index 3ca2ede..bbf0fe1 100644
--- a/recipes/engine/web_engine_drone_1_27_0.expected/windows-post-submit.json
+++ b/recipes/engine/web_engine_drone_1_27_0.expected/windows-post-submit.json
@@ -317,7 +317,6 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -353,7 +352,6 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -389,7 +387,6 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -425,7 +422,6 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine_1_26_0.expected/mac.json b/recipes/engine_1_26_0.expected/mac.json
index a8662d9..2475560 100644
--- a/recipes/engine_1_26_0.expected/mac.json
+++ b/recipes/engine_1_26_0.expected/mac.json
@@ -246,6 +246,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/mac_maven_or_bitcode.json b/recipes/engine_1_26_0.expected/mac_maven_or_bitcode.json
index 15f936d..f54c070 100644
--- a/recipes/engine_1_26_0.expected/mac_maven_or_bitcode.json
+++ b/recipes/engine_1_26_0.expected/mac_maven_or_bitcode.json
@@ -246,6 +246,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/mac_maven_or_bitcode_no_lto.json b/recipes/engine_1_26_0.expected/mac_maven_or_bitcode_no_lto.json
index 501aa23..7ea4f47 100644
--- a/recipes/engine_1_26_0.expected/mac_maven_or_bitcode_no_lto.json
+++ b/recipes/engine_1_26_0.expected/mac_maven_or_bitcode_no_lto.json
@@ -246,6 +246,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/mac_maven_or_bitcode_publish_cipd.json b/recipes/engine_1_26_0.expected/mac_maven_or_bitcode_publish_cipd.json
index 15f936d..f54c070 100644
--- a/recipes/engine_1_26_0.expected/mac_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine_1_26_0.expected/mac_maven_or_bitcode_publish_cipd.json
@@ -246,6 +246,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/mac_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine_1_26_0.expected/mac_maven_or_bitcode_publish_cipd_no_lto.json
index 501aa23..7ea4f47 100644
--- a/recipes/engine_1_26_0.expected/mac_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine_1_26_0.expected/mac_maven_or_bitcode_publish_cipd_no_lto.json
@@ -246,6 +246,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/mac_no_lto.json b/recipes/engine_1_26_0.expected/mac_no_lto.json
index 8df6487..b44b8f9 100644
--- a/recipes/engine_1_26_0.expected/mac_no_lto.json
+++ b/recipes/engine_1_26_0.expected/mac_no_lto.json
@@ -246,6 +246,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/mac_publish_cipd.json b/recipes/engine_1_26_0.expected/mac_publish_cipd.json
index a8662d9..2475560 100644
--- a/recipes/engine_1_26_0.expected/mac_publish_cipd.json
+++ b/recipes/engine_1_26_0.expected/mac_publish_cipd.json
@@ -246,6 +246,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/mac_publish_cipd_no_lto.json b/recipes/engine_1_26_0.expected/mac_publish_cipd_no_lto.json
index 8df6487..b44b8f9 100644
--- a/recipes/engine_1_26_0.expected/mac_publish_cipd_no_lto.json
+++ b/recipes/engine_1_26_0.expected/mac_publish_cipd_no_lto.json
@@ -246,6 +246,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/mac_upload.json b/recipes/engine_1_26_0.expected/mac_upload.json
index df59325..734038d 100644
--- a/recipes/engine_1_26_0.expected/mac_upload.json
+++ b/recipes/engine_1_26_0.expected/mac_upload.json
@@ -246,6 +246,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/mac_upload_maven_or_bitcode.json b/recipes/engine_1_26_0.expected/mac_upload_maven_or_bitcode.json
index 75aab82..b8ae44f 100644
--- a/recipes/engine_1_26_0.expected/mac_upload_maven_or_bitcode.json
+++ b/recipes/engine_1_26_0.expected/mac_upload_maven_or_bitcode.json
@@ -246,6 +246,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/mac_upload_maven_or_bitcode_no_lto.json b/recipes/engine_1_26_0.expected/mac_upload_maven_or_bitcode_no_lto.json
index bf5d4f0..6e9a72e 100644
--- a/recipes/engine_1_26_0.expected/mac_upload_maven_or_bitcode_no_lto.json
+++ b/recipes/engine_1_26_0.expected/mac_upload_maven_or_bitcode_no_lto.json
@@ -246,6 +246,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/mac_upload_maven_or_bitcode_publish_cipd.json b/recipes/engine_1_26_0.expected/mac_upload_maven_or_bitcode_publish_cipd.json
index 75aab82..b8ae44f 100644
--- a/recipes/engine_1_26_0.expected/mac_upload_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine_1_26_0.expected/mac_upload_maven_or_bitcode_publish_cipd.json
@@ -246,6 +246,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/mac_upload_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine_1_26_0.expected/mac_upload_maven_or_bitcode_publish_cipd_no_lto.json
index bf5d4f0..6e9a72e 100644
--- a/recipes/engine_1_26_0.expected/mac_upload_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine_1_26_0.expected/mac_upload_maven_or_bitcode_publish_cipd_no_lto.json
@@ -246,6 +246,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/mac_upload_no_lto.json b/recipes/engine_1_26_0.expected/mac_upload_no_lto.json
index 22b0aae..c547147 100644
--- a/recipes/engine_1_26_0.expected/mac_upload_no_lto.json
+++ b/recipes/engine_1_26_0.expected/mac_upload_no_lto.json
@@ -246,6 +246,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/mac_upload_publish_cipd.json b/recipes/engine_1_26_0.expected/mac_upload_publish_cipd.json
index df59325..734038d 100644
--- a/recipes/engine_1_26_0.expected/mac_upload_publish_cipd.json
+++ b/recipes/engine_1_26_0.expected/mac_upload_publish_cipd.json
@@ -246,6 +246,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/mac_upload_publish_cipd_no_lto.json b/recipes/engine_1_26_0.expected/mac_upload_publish_cipd_no_lto.json
index 22b0aae..c547147 100644
--- a/recipes/engine_1_26_0.expected/mac_upload_publish_cipd_no_lto.json
+++ b/recipes/engine_1_26_0.expected/mac_upload_publish_cipd_no_lto.json
@@ -246,6 +246,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
diff --git a/recipes/engine_1_26_0.expected/win.json b/recipes/engine_1_26_0.expected/win.json
index e52954e..015fec9 100644
--- a/recipes/engine_1_26_0.expected/win.json
+++ b/recipes/engine_1_26_0.expected/win.json
@@ -5383,7 +5383,6 @@
       "java.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5397,7 +5396,6 @@
       "dart.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5411,7 +5409,6 @@
       "adb.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5425,7 +5422,6 @@
       "flutter_tester.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine_1_26_0.expected/win_maven_or_bitcode.json b/recipes/engine_1_26_0.expected/win_maven_or_bitcode.json
index e52954e..015fec9 100644
--- a/recipes/engine_1_26_0.expected/win_maven_or_bitcode.json
+++ b/recipes/engine_1_26_0.expected/win_maven_or_bitcode.json
@@ -5383,7 +5383,6 @@
       "java.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5397,7 +5396,6 @@
       "dart.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5411,7 +5409,6 @@
       "adb.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5425,7 +5422,6 @@
       "flutter_tester.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine_1_26_0.expected/win_maven_or_bitcode_no_lto.json b/recipes/engine_1_26_0.expected/win_maven_or_bitcode_no_lto.json
index 3df8ec7..b8ed818 100644
--- a/recipes/engine_1_26_0.expected/win_maven_or_bitcode_no_lto.json
+++ b/recipes/engine_1_26_0.expected/win_maven_or_bitcode_no_lto.json
@@ -5390,7 +5390,6 @@
       "java.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5404,7 +5403,6 @@
       "dart.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5418,7 +5416,6 @@
       "adb.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5432,7 +5429,6 @@
       "flutter_tester.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine_1_26_0.expected/win_maven_or_bitcode_publish_cipd.json b/recipes/engine_1_26_0.expected/win_maven_or_bitcode_publish_cipd.json
index e52954e..015fec9 100644
--- a/recipes/engine_1_26_0.expected/win_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine_1_26_0.expected/win_maven_or_bitcode_publish_cipd.json
@@ -5383,7 +5383,6 @@
       "java.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5397,7 +5396,6 @@
       "dart.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5411,7 +5409,6 @@
       "adb.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5425,7 +5422,6 @@
       "flutter_tester.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine_1_26_0.expected/win_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine_1_26_0.expected/win_maven_or_bitcode_publish_cipd_no_lto.json
index 3df8ec7..b8ed818 100644
--- a/recipes/engine_1_26_0.expected/win_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine_1_26_0.expected/win_maven_or_bitcode_publish_cipd_no_lto.json
@@ -5390,7 +5390,6 @@
       "java.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5404,7 +5403,6 @@
       "dart.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5418,7 +5416,6 @@
       "adb.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5432,7 +5429,6 @@
       "flutter_tester.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine_1_26_0.expected/win_no_lto.json b/recipes/engine_1_26_0.expected/win_no_lto.json
index 3df8ec7..b8ed818 100644
--- a/recipes/engine_1_26_0.expected/win_no_lto.json
+++ b/recipes/engine_1_26_0.expected/win_no_lto.json
@@ -5390,7 +5390,6 @@
       "java.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5404,7 +5403,6 @@
       "dart.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5418,7 +5416,6 @@
       "adb.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5432,7 +5429,6 @@
       "flutter_tester.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine_1_26_0.expected/win_publish_cipd.json b/recipes/engine_1_26_0.expected/win_publish_cipd.json
index e52954e..015fec9 100644
--- a/recipes/engine_1_26_0.expected/win_publish_cipd.json
+++ b/recipes/engine_1_26_0.expected/win_publish_cipd.json
@@ -5383,7 +5383,6 @@
       "java.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5397,7 +5396,6 @@
       "dart.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5411,7 +5409,6 @@
       "adb.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5425,7 +5422,6 @@
       "flutter_tester.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine_1_26_0.expected/win_publish_cipd_no_lto.json b/recipes/engine_1_26_0.expected/win_publish_cipd_no_lto.json
index 3df8ec7..b8ed818 100644
--- a/recipes/engine_1_26_0.expected/win_publish_cipd_no_lto.json
+++ b/recipes/engine_1_26_0.expected/win_publish_cipd_no_lto.json
@@ -5390,7 +5390,6 @@
       "java.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5404,7 +5403,6 @@
       "dart.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5418,7 +5416,6 @@
       "adb.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5432,7 +5429,6 @@
       "flutter_tester.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine_1_26_0.expected/win_upload.json b/recipes/engine_1_26_0.expected/win_upload.json
index b5435c6..f310d7b 100644
--- a/recipes/engine_1_26_0.expected/win_upload.json
+++ b/recipes/engine_1_26_0.expected/win_upload.json
@@ -6535,7 +6535,6 @@
       "java.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6549,7 +6548,6 @@
       "dart.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6563,7 +6561,6 @@
       "adb.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6577,7 +6574,6 @@
       "flutter_tester.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine_1_26_0.expected/win_upload_maven_or_bitcode.json b/recipes/engine_1_26_0.expected/win_upload_maven_or_bitcode.json
index b5435c6..f310d7b 100644
--- a/recipes/engine_1_26_0.expected/win_upload_maven_or_bitcode.json
+++ b/recipes/engine_1_26_0.expected/win_upload_maven_or_bitcode.json
@@ -6535,7 +6535,6 @@
       "java.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6549,7 +6548,6 @@
       "dart.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6563,7 +6561,6 @@
       "adb.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6577,7 +6574,6 @@
       "flutter_tester.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine_1_26_0.expected/win_upload_maven_or_bitcode_no_lto.json b/recipes/engine_1_26_0.expected/win_upload_maven_or_bitcode_no_lto.json
index 7000f78..632bce7 100644
--- a/recipes/engine_1_26_0.expected/win_upload_maven_or_bitcode_no_lto.json
+++ b/recipes/engine_1_26_0.expected/win_upload_maven_or_bitcode_no_lto.json
@@ -6542,7 +6542,6 @@
       "java.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6556,7 +6555,6 @@
       "dart.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6570,7 +6568,6 @@
       "adb.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6584,7 +6581,6 @@
       "flutter_tester.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine_1_26_0.expected/win_upload_maven_or_bitcode_publish_cipd.json b/recipes/engine_1_26_0.expected/win_upload_maven_or_bitcode_publish_cipd.json
index b5435c6..f310d7b 100644
--- a/recipes/engine_1_26_0.expected/win_upload_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine_1_26_0.expected/win_upload_maven_or_bitcode_publish_cipd.json
@@ -6535,7 +6535,6 @@
       "java.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6549,7 +6548,6 @@
       "dart.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6563,7 +6561,6 @@
       "adb.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6577,7 +6574,6 @@
       "flutter_tester.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine_1_26_0.expected/win_upload_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine_1_26_0.expected/win_upload_maven_or_bitcode_publish_cipd_no_lto.json
index 7000f78..632bce7 100644
--- a/recipes/engine_1_26_0.expected/win_upload_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine_1_26_0.expected/win_upload_maven_or_bitcode_publish_cipd_no_lto.json
@@ -6542,7 +6542,6 @@
       "java.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6556,7 +6555,6 @@
       "dart.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6570,7 +6568,6 @@
       "adb.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6584,7 +6581,6 @@
       "flutter_tester.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine_1_26_0.expected/win_upload_no_lto.json b/recipes/engine_1_26_0.expected/win_upload_no_lto.json
index 7000f78..632bce7 100644
--- a/recipes/engine_1_26_0.expected/win_upload_no_lto.json
+++ b/recipes/engine_1_26_0.expected/win_upload_no_lto.json
@@ -6542,7 +6542,6 @@
       "java.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6556,7 +6555,6 @@
       "dart.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6570,7 +6568,6 @@
       "adb.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6584,7 +6581,6 @@
       "flutter_tester.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine_1_26_0.expected/win_upload_publish_cipd.json b/recipes/engine_1_26_0.expected/win_upload_publish_cipd.json
index b5435c6..f310d7b 100644
--- a/recipes/engine_1_26_0.expected/win_upload_publish_cipd.json
+++ b/recipes/engine_1_26_0.expected/win_upload_publish_cipd.json
@@ -6535,7 +6535,6 @@
       "java.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6549,7 +6548,6 @@
       "dart.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6563,7 +6561,6 @@
       "adb.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6577,7 +6574,6 @@
       "flutter_tester.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine_1_26_0.expected/win_upload_publish_cipd_no_lto.json b/recipes/engine_1_26_0.expected/win_upload_publish_cipd_no_lto.json
index 7000f78..632bce7 100644
--- a/recipes/engine_1_26_0.expected/win_upload_publish_cipd_no_lto.json
+++ b/recipes/engine_1_26_0.expected/win_upload_publish_cipd_no_lto.json
@@ -6542,7 +6542,6 @@
       "java.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6556,7 +6555,6 @@
       "dart.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6570,7 +6568,6 @@
       "adb.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6584,7 +6581,6 @@
       "flutter_tester.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine_1_27_0.expected/mac.json b/recipes/engine_1_27_0.expected/mac.json
index a8662d9..2475560 100644
--- a/recipes/engine_1_27_0.expected/mac.json
+++ b/recipes/engine_1_27_0.expected/mac.json
@@ -246,6 +246,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/mac_maven_or_bitcode.json b/recipes/engine_1_27_0.expected/mac_maven_or_bitcode.json
index 15f936d..f54c070 100644
--- a/recipes/engine_1_27_0.expected/mac_maven_or_bitcode.json
+++ b/recipes/engine_1_27_0.expected/mac_maven_or_bitcode.json
@@ -246,6 +246,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/mac_maven_or_bitcode_no_lto.json b/recipes/engine_1_27_0.expected/mac_maven_or_bitcode_no_lto.json
index 501aa23..7ea4f47 100644
--- a/recipes/engine_1_27_0.expected/mac_maven_or_bitcode_no_lto.json
+++ b/recipes/engine_1_27_0.expected/mac_maven_or_bitcode_no_lto.json
@@ -246,6 +246,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/mac_maven_or_bitcode_publish_cipd.json b/recipes/engine_1_27_0.expected/mac_maven_or_bitcode_publish_cipd.json
index 15f936d..f54c070 100644
--- a/recipes/engine_1_27_0.expected/mac_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine_1_27_0.expected/mac_maven_or_bitcode_publish_cipd.json
@@ -246,6 +246,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/mac_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine_1_27_0.expected/mac_maven_or_bitcode_publish_cipd_no_lto.json
index 501aa23..7ea4f47 100644
--- a/recipes/engine_1_27_0.expected/mac_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine_1_27_0.expected/mac_maven_or_bitcode_publish_cipd_no_lto.json
@@ -246,6 +246,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/mac_no_lto.json b/recipes/engine_1_27_0.expected/mac_no_lto.json
index 8df6487..b44b8f9 100644
--- a/recipes/engine_1_27_0.expected/mac_no_lto.json
+++ b/recipes/engine_1_27_0.expected/mac_no_lto.json
@@ -246,6 +246,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/mac_publish_cipd.json b/recipes/engine_1_27_0.expected/mac_publish_cipd.json
index a8662d9..2475560 100644
--- a/recipes/engine_1_27_0.expected/mac_publish_cipd.json
+++ b/recipes/engine_1_27_0.expected/mac_publish_cipd.json
@@ -246,6 +246,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/mac_publish_cipd_no_lto.json b/recipes/engine_1_27_0.expected/mac_publish_cipd_no_lto.json
index 8df6487..b44b8f9 100644
--- a/recipes/engine_1_27_0.expected/mac_publish_cipd_no_lto.json
+++ b/recipes/engine_1_27_0.expected/mac_publish_cipd_no_lto.json
@@ -246,6 +246,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/mac_upload.json b/recipes/engine_1_27_0.expected/mac_upload.json
index df59325..734038d 100644
--- a/recipes/engine_1_27_0.expected/mac_upload.json
+++ b/recipes/engine_1_27_0.expected/mac_upload.json
@@ -246,6 +246,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/mac_upload_maven_or_bitcode.json b/recipes/engine_1_27_0.expected/mac_upload_maven_or_bitcode.json
index 75aab82..b8ae44f 100644
--- a/recipes/engine_1_27_0.expected/mac_upload_maven_or_bitcode.json
+++ b/recipes/engine_1_27_0.expected/mac_upload_maven_or_bitcode.json
@@ -246,6 +246,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/mac_upload_maven_or_bitcode_no_lto.json b/recipes/engine_1_27_0.expected/mac_upload_maven_or_bitcode_no_lto.json
index bf5d4f0..6e9a72e 100644
--- a/recipes/engine_1_27_0.expected/mac_upload_maven_or_bitcode_no_lto.json
+++ b/recipes/engine_1_27_0.expected/mac_upload_maven_or_bitcode_no_lto.json
@@ -246,6 +246,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/mac_upload_maven_or_bitcode_publish_cipd.json b/recipes/engine_1_27_0.expected/mac_upload_maven_or_bitcode_publish_cipd.json
index 75aab82..b8ae44f 100644
--- a/recipes/engine_1_27_0.expected/mac_upload_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine_1_27_0.expected/mac_upload_maven_or_bitcode_publish_cipd.json
@@ -246,6 +246,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/mac_upload_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine_1_27_0.expected/mac_upload_maven_or_bitcode_publish_cipd_no_lto.json
index bf5d4f0..6e9a72e 100644
--- a/recipes/engine_1_27_0.expected/mac_upload_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine_1_27_0.expected/mac_upload_maven_or_bitcode_publish_cipd_no_lto.json
@@ -246,6 +246,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/mac_upload_no_lto.json b/recipes/engine_1_27_0.expected/mac_upload_no_lto.json
index 22b0aae..c547147 100644
--- a/recipes/engine_1_27_0.expected/mac_upload_no_lto.json
+++ b/recipes/engine_1_27_0.expected/mac_upload_no_lto.json
@@ -246,6 +246,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/mac_upload_publish_cipd.json b/recipes/engine_1_27_0.expected/mac_upload_publish_cipd.json
index df59325..734038d 100644
--- a/recipes/engine_1_27_0.expected/mac_upload_publish_cipd.json
+++ b/recipes/engine_1_27_0.expected/mac_upload_publish_cipd.json
@@ -246,6 +246,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/mac_upload_publish_cipd_no_lto.json b/recipes/engine_1_27_0.expected/mac_upload_publish_cipd_no_lto.json
index 22b0aae..c547147 100644
--- a/recipes/engine_1_27_0.expected/mac_upload_publish_cipd_no_lto.json
+++ b/recipes/engine_1_27_0.expected/mac_upload_publish_cipd_no_lto.json
@@ -246,6 +246,7 @@
       "-rf",
       "[HOME]/Library/Developer/Xcode/DerivedData"
     ],
+    "infra_step": true,
     "name": "Delete mac deriveddata"
   },
   {
diff --git a/recipes/engine_1_27_0.expected/win.json b/recipes/engine_1_27_0.expected/win.json
index e52954e..015fec9 100644
--- a/recipes/engine_1_27_0.expected/win.json
+++ b/recipes/engine_1_27_0.expected/win.json
@@ -5383,7 +5383,6 @@
       "java.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5397,7 +5396,6 @@
       "dart.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5411,7 +5409,6 @@
       "adb.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5425,7 +5422,6 @@
       "flutter_tester.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine_1_27_0.expected/win_maven_or_bitcode.json b/recipes/engine_1_27_0.expected/win_maven_or_bitcode.json
index e52954e..015fec9 100644
--- a/recipes/engine_1_27_0.expected/win_maven_or_bitcode.json
+++ b/recipes/engine_1_27_0.expected/win_maven_or_bitcode.json
@@ -5383,7 +5383,6 @@
       "java.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5397,7 +5396,6 @@
       "dart.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5411,7 +5409,6 @@
       "adb.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5425,7 +5422,6 @@
       "flutter_tester.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine_1_27_0.expected/win_maven_or_bitcode_no_lto.json b/recipes/engine_1_27_0.expected/win_maven_or_bitcode_no_lto.json
index 3df8ec7..b8ed818 100644
--- a/recipes/engine_1_27_0.expected/win_maven_or_bitcode_no_lto.json
+++ b/recipes/engine_1_27_0.expected/win_maven_or_bitcode_no_lto.json
@@ -5390,7 +5390,6 @@
       "java.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5404,7 +5403,6 @@
       "dart.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5418,7 +5416,6 @@
       "adb.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5432,7 +5429,6 @@
       "flutter_tester.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine_1_27_0.expected/win_maven_or_bitcode_publish_cipd.json b/recipes/engine_1_27_0.expected/win_maven_or_bitcode_publish_cipd.json
index e52954e..015fec9 100644
--- a/recipes/engine_1_27_0.expected/win_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine_1_27_0.expected/win_maven_or_bitcode_publish_cipd.json
@@ -5383,7 +5383,6 @@
       "java.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5397,7 +5396,6 @@
       "dart.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5411,7 +5409,6 @@
       "adb.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5425,7 +5422,6 @@
       "flutter_tester.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine_1_27_0.expected/win_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine_1_27_0.expected/win_maven_or_bitcode_publish_cipd_no_lto.json
index 3df8ec7..b8ed818 100644
--- a/recipes/engine_1_27_0.expected/win_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine_1_27_0.expected/win_maven_or_bitcode_publish_cipd_no_lto.json
@@ -5390,7 +5390,6 @@
       "java.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5404,7 +5403,6 @@
       "dart.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5418,7 +5416,6 @@
       "adb.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5432,7 +5429,6 @@
       "flutter_tester.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine_1_27_0.expected/win_no_lto.json b/recipes/engine_1_27_0.expected/win_no_lto.json
index 3df8ec7..b8ed818 100644
--- a/recipes/engine_1_27_0.expected/win_no_lto.json
+++ b/recipes/engine_1_27_0.expected/win_no_lto.json
@@ -5390,7 +5390,6 @@
       "java.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5404,7 +5403,6 @@
       "dart.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5418,7 +5416,6 @@
       "adb.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5432,7 +5429,6 @@
       "flutter_tester.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine_1_27_0.expected/win_publish_cipd.json b/recipes/engine_1_27_0.expected/win_publish_cipd.json
index e52954e..015fec9 100644
--- a/recipes/engine_1_27_0.expected/win_publish_cipd.json
+++ b/recipes/engine_1_27_0.expected/win_publish_cipd.json
@@ -5383,7 +5383,6 @@
       "java.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5397,7 +5396,6 @@
       "dart.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5411,7 +5409,6 @@
       "adb.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5425,7 +5422,6 @@
       "flutter_tester.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine_1_27_0.expected/win_publish_cipd_no_lto.json b/recipes/engine_1_27_0.expected/win_publish_cipd_no_lto.json
index 3df8ec7..b8ed818 100644
--- a/recipes/engine_1_27_0.expected/win_publish_cipd_no_lto.json
+++ b/recipes/engine_1_27_0.expected/win_publish_cipd_no_lto.json
@@ -5390,7 +5390,6 @@
       "java.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5404,7 +5403,6 @@
       "dart.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5418,7 +5416,6 @@
       "adb.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -5432,7 +5429,6 @@
       "flutter_tester.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine_1_27_0.expected/win_upload.json b/recipes/engine_1_27_0.expected/win_upload.json
index b5435c6..f310d7b 100644
--- a/recipes/engine_1_27_0.expected/win_upload.json
+++ b/recipes/engine_1_27_0.expected/win_upload.json
@@ -6535,7 +6535,6 @@
       "java.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6549,7 +6548,6 @@
       "dart.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6563,7 +6561,6 @@
       "adb.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6577,7 +6574,6 @@
       "flutter_tester.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine_1_27_0.expected/win_upload_maven_or_bitcode.json b/recipes/engine_1_27_0.expected/win_upload_maven_or_bitcode.json
index b5435c6..f310d7b 100644
--- a/recipes/engine_1_27_0.expected/win_upload_maven_or_bitcode.json
+++ b/recipes/engine_1_27_0.expected/win_upload_maven_or_bitcode.json
@@ -6535,7 +6535,6 @@
       "java.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6549,7 +6548,6 @@
       "dart.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6563,7 +6561,6 @@
       "adb.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6577,7 +6574,6 @@
       "flutter_tester.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine_1_27_0.expected/win_upload_maven_or_bitcode_no_lto.json b/recipes/engine_1_27_0.expected/win_upload_maven_or_bitcode_no_lto.json
index 7000f78..632bce7 100644
--- a/recipes/engine_1_27_0.expected/win_upload_maven_or_bitcode_no_lto.json
+++ b/recipes/engine_1_27_0.expected/win_upload_maven_or_bitcode_no_lto.json
@@ -6542,7 +6542,6 @@
       "java.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6556,7 +6555,6 @@
       "dart.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6570,7 +6568,6 @@
       "adb.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6584,7 +6581,6 @@
       "flutter_tester.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine_1_27_0.expected/win_upload_maven_or_bitcode_publish_cipd.json b/recipes/engine_1_27_0.expected/win_upload_maven_or_bitcode_publish_cipd.json
index b5435c6..f310d7b 100644
--- a/recipes/engine_1_27_0.expected/win_upload_maven_or_bitcode_publish_cipd.json
+++ b/recipes/engine_1_27_0.expected/win_upload_maven_or_bitcode_publish_cipd.json
@@ -6535,7 +6535,6 @@
       "java.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6549,7 +6548,6 @@
       "dart.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6563,7 +6561,6 @@
       "adb.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6577,7 +6574,6 @@
       "flutter_tester.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine_1_27_0.expected/win_upload_maven_or_bitcode_publish_cipd_no_lto.json b/recipes/engine_1_27_0.expected/win_upload_maven_or_bitcode_publish_cipd_no_lto.json
index 7000f78..632bce7 100644
--- a/recipes/engine_1_27_0.expected/win_upload_maven_or_bitcode_publish_cipd_no_lto.json
+++ b/recipes/engine_1_27_0.expected/win_upload_maven_or_bitcode_publish_cipd_no_lto.json
@@ -6542,7 +6542,6 @@
       "java.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6556,7 +6555,6 @@
       "dart.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6570,7 +6568,6 @@
       "adb.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6584,7 +6581,6 @@
       "flutter_tester.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine_1_27_0.expected/win_upload_no_lto.json b/recipes/engine_1_27_0.expected/win_upload_no_lto.json
index 7000f78..632bce7 100644
--- a/recipes/engine_1_27_0.expected/win_upload_no_lto.json
+++ b/recipes/engine_1_27_0.expected/win_upload_no_lto.json
@@ -6542,7 +6542,6 @@
       "java.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6556,7 +6555,6 @@
       "dart.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6570,7 +6568,6 @@
       "adb.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6584,7 +6581,6 @@
       "flutter_tester.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine_1_27_0.expected/win_upload_publish_cipd.json b/recipes/engine_1_27_0.expected/win_upload_publish_cipd.json
index b5435c6..f310d7b 100644
--- a/recipes/engine_1_27_0.expected/win_upload_publish_cipd.json
+++ b/recipes/engine_1_27_0.expected/win_upload_publish_cipd.json
@@ -6535,7 +6535,6 @@
       "java.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6549,7 +6548,6 @@
       "dart.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6563,7 +6561,6 @@
       "adb.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6577,7 +6574,6 @@
       "flutter_tester.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/engine_1_27_0.expected/win_upload_publish_cipd_no_lto.json b/recipes/engine_1_27_0.expected/win_upload_publish_cipd_no_lto.json
index 7000f78..632bce7 100644
--- a/recipes/engine_1_27_0.expected/win_upload_publish_cipd_no_lto.json
+++ b/recipes/engine_1_27_0.expected/win_upload_publish_cipd_no_lto.json
@@ -6542,7 +6542,6 @@
       "java.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6556,7 +6555,6 @@
       "dart.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6570,7 +6568,6 @@
       "adb.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -6584,7 +6581,6 @@
       "flutter_tester.exe",
       "/t"
     ],
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/web_engine.expected/windows-post-submit.json b/recipes/web_engine.expected/windows-post-submit.json
index 535060f..12dd0bd 100644
--- a/recipes/web_engine.expected/windows-post-submit.json
+++ b/recipes/web_engine.expected/windows-post-submit.json
@@ -860,7 +860,6 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -894,7 +893,6 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -928,7 +926,6 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -962,7 +959,6 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/web_engine_1_26_0.expected/windows-post-submit.json b/recipes/web_engine_1_26_0.expected/windows-post-submit.json
index 535060f..12dd0bd 100644
--- a/recipes/web_engine_1_26_0.expected/windows-post-submit.json
+++ b/recipes/web_engine_1_26_0.expected/windows-post-submit.json
@@ -860,7 +860,6 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -894,7 +893,6 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -928,7 +926,6 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -962,7 +959,6 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipes/web_engine_1_27_0.expected/windows-post-submit.json b/recipes/web_engine_1_27_0.expected/windows-post-submit.json
index 535060f..12dd0bd 100644
--- a/recipes/web_engine_1_27_0.expected/windows-post-submit.json
+++ b/recipes/web_engine_1_27_0.expected/windows-post-submit.json
@@ -860,7 +860,6 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "infra_step": true,
     "name": "Killing Processes.stop gradle daemon",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -894,7 +893,6 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "infra_step": true,
     "name": "Killing Processes.stop dart",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -928,7 +926,6 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "infra_step": true,
     "name": "Killing Processes.stop adb",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
@@ -962,7 +959,6 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "infra_step": true,
     "name": "Killing Processes.stop flutter_tester",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"