diff --git a/recipe_modules/build/tests/full.expected/default.json b/recipe_modules/build/tests/full.expected/default.json
index 8843d03..ba101e7 100644
--- a/recipe_modules/build/tests/full.expected/default.json
+++ b/recipe_modules/build/tests/full.expected/default.json
@@ -22,7 +22,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000011.5
+        "soft_deadline": 1337000013.0
       }
     },
     "name": "ninja"
diff --git a/recipe_modules/build/tests/full.expected/full.json b/recipe_modules/build/tests/full.expected/full.json
index 7f7136f..bdb3368 100644
--- a/recipe_modules/build/tests/full.expected/full.json
+++ b/recipe_modules/build/tests/full.expected/full.json
@@ -42,7 +42,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000011.5
+        "soft_deadline": 1337000013.0
       }
     },
     "name": "ninja"
diff --git a/recipe_modules/checkout/tests/git.expected/ci.json b/recipe_modules/checkout/tests/git.expected/ci.json
index 1788fd9..9769479 100644
--- a/recipe_modules/checkout/tests/git.expected/ci.json
+++ b/recipe_modules/checkout/tests/git.expected/ci.json
@@ -599,7 +599,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:ci"
diff --git a/recipe_modules/checkout/tests/git.expected/not_in_gerrit.json b/recipe_modules/checkout/tests/git.expected/not_in_gerrit.json
index 468b8c8..0807a6b 100644
--- a/recipe_modules/checkout/tests/git.expected/not_in_gerrit.json
+++ b/recipe_modules/checkout/tests/git.expected/not_in_gerrit.json
@@ -410,7 +410,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       }
     },
     "name": "checkout pigweed.git checkout.makedirs",
diff --git a/recipe_modules/checkout/tests/git.expected/other.json b/recipe_modules/checkout/tests/git.expected/other.json
index 25d8b4f..b4daca3 100644
--- a/recipe_modules/checkout/tests/git.expected/other.json
+++ b/recipe_modules/checkout/tests/git.expected/other.json
@@ -416,7 +416,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       }
     },
     "name": "checkout pigweed.git checkout.makedirs",
diff --git a/recipe_modules/checkout/tests/git.expected/trigger.json b/recipe_modules/checkout/tests/git.expected/trigger.json
index 56ea780..40d952f 100644
--- a/recipe_modules/checkout/tests/git.expected/trigger.json
+++ b/recipe_modules/checkout/tests/git.expected/trigger.json
@@ -651,7 +651,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:ci"
diff --git a/recipe_modules/checkout/tests/git.expected/try.json b/recipe_modules/checkout/tests/git.expected/try.json
index 18186c6..84b5b6d 100644
--- a/recipe_modules/checkout/tests/git.expected/try.json
+++ b/recipe_modules/checkout/tests/git.expected/try.json
@@ -812,7 +812,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:try"
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-ci.json b/recipe_modules/checkout/tests/submodule.expected/submodule-ci.json
index 7cede84..38d7e95 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-ci.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-ci.json
@@ -571,7 +571,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:ci"
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-match.json b/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-match.json
index 048e073..8fe6193 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-match.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-match.json
@@ -783,7 +783,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:try"
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-nomatch.json b/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-nomatch.json
index 60d3947..5288281 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-nomatch.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-nomatch.json
@@ -783,7 +783,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:try"
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-twomatch.json b/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-twomatch.json
index 3a0f504..10ba4ac 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-twomatch.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-twomatch.json
@@ -783,7 +783,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:try"
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-equivalent.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-equivalent.json
index 9237da2..f394e3d 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-equivalent.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-equivalent.json
@@ -783,7 +783,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:try"
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-excluded.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-excluded.json
index dd92ea6..0e29fcd 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-excluded.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-excluded.json
@@ -677,7 +677,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000016.0
+        "soft_deadline": 1337000022.0
       },
       "realm": {
         "name": "project:ci"
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-included.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-included.json
index 922f655..4b2ca7c 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-included.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-included.json
@@ -644,7 +644,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000016.0
+        "soft_deadline": 1337000022.0
       },
       "realm": {
         "name": "project:ci"
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-cqdeps.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-cqdeps.json
index 2cb90ac..b102933 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-cqdeps.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-cqdeps.json
@@ -1275,7 +1275,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:try"
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing-one-forbidden-cqdeps.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing-one-forbidden-cqdeps.json
index f3f0c94..bf0576e 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing-one-forbidden-cqdeps.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing-one-forbidden-cqdeps.json
@@ -1374,7 +1374,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:try"
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing.json
index 28aa963..420b065 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing.json
@@ -930,7 +930,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:try"
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple.json
index 31bda07..e1b95c3 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple.json
@@ -929,7 +929,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:try"
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-not-found.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-not-found.json
index 70b1817..ba3a74d 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-not-found.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-not-found.json
@@ -783,7 +783,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:try"
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try.json
index 8859a3f..bbc6797 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try.json
@@ -783,7 +783,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:try"
diff --git a/recipe_modules/default_timeout/api.py b/recipe_modules/default_timeout/api.py
index 662612e..18c550c 100644
--- a/recipe_modules/default_timeout/api.py
+++ b/recipe_modules/default_timeout/api.py
@@ -17,7 +17,6 @@
 import dataclasses
 
 from recipe_engine import recipe_api
-from PB.go.chromium.org.luci.lucictx import sections as sections_pb2
 from RECIPE_MODULES.fuchsia.utils import nice_duration
 
 
@@ -53,12 +52,8 @@
         with self.m.step.nest(f'timeout {nice_duration(timeout_sec)}'):
             pass
 
-        deadline = sections_pb2.Deadline()
-        deadline.soft_deadline = current_time_sec + timeout_sec
-        deadline.grace_period = 30.0
-
         try:
-            with self.m.context(deadline=deadline):
+            with self.m.time.timeout(timeout_sec):
                 yield
 
         finally:
diff --git a/recipe_modules/default_timeout/tests/full.expected/medium.json b/recipe_modules/default_timeout/tests/full.expected/medium.json
index bbc6142..34cb945 100644
--- a/recipe_modules/default_timeout/tests/full.expected/medium.json
+++ b/recipe_modules/default_timeout/tests/full.expected/medium.json
@@ -10,7 +10,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1600001680.0
+        "soft_deadline": 1600001700.0
       },
       "realm": {
         "name": "project:try"
@@ -27,7 +27,7 @@
   },
   {
     "cmd": [],
-    "name": "timeout 27m 20s"
+    "name": "timeout 27m"
   },
   {
     "cmd": [
@@ -36,7 +36,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1600001680.0
+        "soft_deadline": 1600001700.0
       },
       "realm": {
         "name": "project:try"
diff --git a/recipe_modules/default_timeout/tests/full.expected/no-special-timing.json b/recipe_modules/default_timeout/tests/full.expected/no-special-timing.json
index ef1c4fe..9a17e66 100644
--- a/recipe_modules/default_timeout/tests/full.expected/no-special-timing.json
+++ b/recipe_modules/default_timeout/tests/full.expected/no-special-timing.json
@@ -10,7 +10,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000011.5
+        "soft_deadline": 1337000013.0
       }
     },
     "name": "step1"
@@ -26,7 +26,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000013.0
+        "soft_deadline": 1337000016.0
       }
     },
     "name": "step2"
diff --git a/recipe_modules/environment/tests/full.expected/doctor-fail.json b/recipe_modules/environment/tests/full.expected/doctor-fail.json
index 2dacf72..e1328d7 100644
--- a/recipe_modules/environment/tests/full.expected/doctor-fail.json
+++ b/recipe_modules/environment/tests/full.expected/doctor-fail.json
@@ -128,7 +128,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000011.5
+        "soft_deadline": 1337000013.0
       }
     },
     "name": "environment.run pw_env_setup.pw_env_setup",
diff --git a/recipe_modules/environment/tests/full.expected/normal.json b/recipe_modules/environment/tests/full.expected/normal.json
index 2eee593..26a6728 100644
--- a/recipe_modules/environment/tests/full.expected/normal.json
+++ b/recipe_modules/environment/tests/full.expected/normal.json
@@ -327,7 +327,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000011.5
+        "soft_deadline": 1337000013.0
       }
     },
     "name": "environment.run pw_env_setup.pw_env_setup",
diff --git a/recipe_modules/environment/tests/full.expected/override-cas.json b/recipe_modules/environment/tests/full.expected/override-cas.json
index a22e023..cd970ac 100644
--- a/recipe_modules/environment/tests/full.expected/override-cas.json
+++ b/recipe_modules/environment/tests/full.expected/override-cas.json
@@ -128,7 +128,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000011.5
+        "soft_deadline": 1337000013.0
       }
     },
     "name": "environment.run pw_env_setup.pw_env_setup",
diff --git a/recipe_modules/environment/tests/full.expected/override-cipd.json b/recipe_modules/environment/tests/full.expected/override-cipd.json
index 7bcdaeb..1253358 100644
--- a/recipe_modules/environment/tests/full.expected/override-cipd.json
+++ b/recipe_modules/environment/tests/full.expected/override-cipd.json
@@ -128,7 +128,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000011.5
+        "soft_deadline": 1337000013.0
       }
     },
     "name": "environment.run pw_env_setup.pw_env_setup",
diff --git a/recipe_modules/environment/tests/full.expected/windows.json b/recipe_modules/environment/tests/full.expected/windows.json
index fbb019b..16d821a 100644
--- a/recipe_modules/environment/tests/full.expected/windows.json
+++ b/recipe_modules/environment/tests/full.expected/windows.json
@@ -128,7 +128,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000011.5
+        "soft_deadline": 1337000013.0
       }
     },
     "name": "environment.run pw_env_setup.pw_env_setup",
diff --git a/recipe_modules/pw_presubmit/tests/full.expected/bad-json-steps.json b/recipe_modules/pw_presubmit/tests/full.expected/bad-json-steps.json
index adb6874..664702b 100644
--- a/recipe_modules/pw_presubmit/tests/full.expected/bad-json-steps.json
+++ b/recipe_modules/pw_presubmit/tests/full.expected/bad-json-steps.json
@@ -44,7 +44,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000013.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:ci"
@@ -103,7 +103,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000017.5
       },
       "realm": {
         "name": "project:ci"
@@ -168,7 +168,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000016.0
+        "soft_deadline": 1337000020.5
       },
       "realm": {
         "name": "project:ci"
@@ -1257,7 +1257,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000017.5
+        "soft_deadline": 1337000023.5
       },
       "realm": {
         "name": "project:ci"
diff --git a/recipe_modules/pw_presubmit/tests/full.expected/comment-always-disallowed-host.json b/recipe_modules/pw_presubmit/tests/full.expected/comment-always-disallowed-host.json
index afd290f..371b52a 100644
--- a/recipe_modules/pw_presubmit/tests/full.expected/comment-always-disallowed-host.json
+++ b/recipe_modules/pw_presubmit/tests/full.expected/comment-always-disallowed-host.json
@@ -46,7 +46,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1600000050.0
+        "soft_deadline": 1600000070.0
       },
       "realm": {
         "name": "project:try"
@@ -159,7 +159,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1600000070.0
+        "soft_deadline": 1600000110.0
       },
       "realm": {
         "name": "project:try"
@@ -1258,7 +1258,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1600000090.0
+        "soft_deadline": 1600000150.0
       },
       "realm": {
         "name": "project:try"
diff --git a/recipe_modules/pw_presubmit/tests/full.expected/comment-always-no-cl.json b/recipe_modules/pw_presubmit/tests/full.expected/comment-always-no-cl.json
index 9c44a58..bbc7f4c 100644
--- a/recipe_modules/pw_presubmit/tests/full.expected/comment-always-no-cl.json
+++ b/recipe_modules/pw_presubmit/tests/full.expected/comment-always-no-cl.json
@@ -46,7 +46,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1600000050.0
+        "soft_deadline": 1600000070.0
       },
       "realm": {
         "name": "project:ci"
@@ -159,7 +159,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1600000070.0
+        "soft_deadline": 1600000110.0
       },
       "realm": {
         "name": "project:ci"
@@ -1258,7 +1258,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1600000090.0
+        "soft_deadline": 1600000150.0
       },
       "realm": {
         "name": "project:ci"
diff --git a/recipe_modules/pw_presubmit/tests/full.expected/comment-always.json b/recipe_modules/pw_presubmit/tests/full.expected/comment-always.json
index a0f40da..87b092d 100644
--- a/recipe_modules/pw_presubmit/tests/full.expected/comment-always.json
+++ b/recipe_modules/pw_presubmit/tests/full.expected/comment-always.json
@@ -46,7 +46,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1600000050.0
+        "soft_deadline": 1600000070.0
       },
       "realm": {
         "name": "project:try"
@@ -159,7 +159,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1600000070.0
+        "soft_deadline": 1600000110.0
       },
       "realm": {
         "name": "project:try"
@@ -1421,7 +1421,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1600000090.0
+        "soft_deadline": 1600000150.0
       },
       "realm": {
         "name": "project:try"
diff --git a/recipe_modules/pw_presubmit/tests/full.expected/comment-on-failure.json b/recipe_modules/pw_presubmit/tests/full.expected/comment-on-failure.json
index a7df825..197c224 100644
--- a/recipe_modules/pw_presubmit/tests/full.expected/comment-on-failure.json
+++ b/recipe_modules/pw_presubmit/tests/full.expected/comment-on-failure.json
@@ -46,7 +46,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1600000050.0
+        "soft_deadline": 1600000070.0
       },
       "realm": {
         "name": "project:try"
@@ -159,7 +159,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1600000070.0
+        "soft_deadline": 1600000110.0
       },
       "realm": {
         "name": "project:try"
@@ -1258,7 +1258,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1600000090.0
+        "soft_deadline": 1600000150.0
       },
       "realm": {
         "name": "project:try"
diff --git a/recipe_modules/pw_presubmit/tests/full.expected/empty-program.json b/recipe_modules/pw_presubmit/tests/full.expected/empty-program.json
index 82f45fa..73d8490 100644
--- a/recipe_modules/pw_presubmit/tests/full.expected/empty-program.json
+++ b/recipe_modules/pw_presubmit/tests/full.expected/empty-program.json
@@ -30,7 +30,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000013.0
+        "soft_deadline": 1337000014.5
       }
     },
     "name": "get steps from programs.get steps",
diff --git a/recipe_modules/pw_presubmit/tests/full.expected/long.json b/recipe_modules/pw_presubmit/tests/full.expected/long.json
index 1705a95..82ef1bc 100644
--- a/recipe_modules/pw_presubmit/tests/full.expected/long.json
+++ b/recipe_modules/pw_presubmit/tests/full.expected/long.json
@@ -46,7 +46,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1600010680.0
+        "soft_deadline": 1600010700.0
       },
       "realm": {
         "name": "project:try"
@@ -120,7 +120,7 @@
   },
   {
     "cmd": [],
-    "name": "step1.timeout 2h 57m",
+    "name": "step1.timeout 2h 56m 40s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -159,7 +159,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1600010680.0
+        "soft_deadline": 1600010700.0
       },
       "realm": {
         "name": "project:try"
@@ -1211,7 +1211,7 @@
   },
   {
     "cmd": [],
-    "name": "step2.timeout 2h 56m 40s",
+    "name": "step2.timeout 2h 56m",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -1250,7 +1250,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1600010680.0
+        "soft_deadline": 1600010700.0
       },
       "realm": {
         "name": "project:try"
diff --git a/recipe_modules/pw_presubmit/tests/full.expected/medium.json b/recipe_modules/pw_presubmit/tests/full.expected/medium.json
index de7c715..f9fe5ee 100644
--- a/recipe_modules/pw_presubmit/tests/full.expected/medium.json
+++ b/recipe_modules/pw_presubmit/tests/full.expected/medium.json
@@ -46,7 +46,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1600001680.0
+        "soft_deadline": 1600001700.0
       },
       "realm": {
         "name": "project:try"
@@ -120,7 +120,7 @@
   },
   {
     "cmd": [],
-    "name": "step1.timeout 27m",
+    "name": "step1.timeout 26m 40s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -159,7 +159,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1600001680.0
+        "soft_deadline": 1600001700.0
       },
       "realm": {
         "name": "project:try"
@@ -1211,7 +1211,7 @@
   },
   {
     "cmd": [],
-    "name": "step2.timeout 26m 40s",
+    "name": "step2.timeout 26m",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -1250,7 +1250,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1600001680.0
+        "soft_deadline": 1600001700.0
       },
       "realm": {
         "name": "project:try"
diff --git a/recipe_modules/pw_presubmit/tests/full.expected/pigweed.json b/recipe_modules/pw_presubmit/tests/full.expected/pigweed.json
index 66fc75f..497837e 100644
--- a/recipe_modules/pw_presubmit/tests/full.expected/pigweed.json
+++ b/recipe_modules/pw_presubmit/tests/full.expected/pigweed.json
@@ -44,7 +44,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000013.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:ci"
@@ -157,7 +157,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000017.5
       },
       "realm": {
         "name": "project:ci"
@@ -1248,7 +1248,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000016.0
+        "soft_deadline": 1337000020.5
       },
       "realm": {
         "name": "project:ci"
diff --git a/recipe_modules/pw_presubmit/tests/full.expected/step.json b/recipe_modules/pw_presubmit/tests/full.expected/step.json
index 70a5c92..a773c7a 100644
--- a/recipe_modules/pw_presubmit/tests/full.expected/step.json
+++ b/recipe_modules/pw_presubmit/tests/full.expected/step.json
@@ -48,7 +48,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1600000050.0
+        "soft_deadline": 1600000070.0
       },
       "realm": {
         "name": "project:try"
@@ -167,7 +167,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1600000070.0
+        "soft_deadline": 1600000110.0
       },
       "realm": {
         "name": "project:try"
@@ -1264,7 +1264,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1600000090.0
+        "soft_deadline": 1600000150.0
       },
       "realm": {
         "name": "project:try"
diff --git a/recipe_modules/pw_presubmit/tests/full.expected/substep.json b/recipe_modules/pw_presubmit/tests/full.expected/substep.json
index 62a065b..b0b2e28 100644
--- a/recipe_modules/pw_presubmit/tests/full.expected/substep.json
+++ b/recipe_modules/pw_presubmit/tests/full.expected/substep.json
@@ -33,7 +33,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000013.0
+        "soft_deadline": 1337000014.5
       }
     },
     "name": "get steps from programs.get steps",
@@ -111,7 +111,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000017.5
       }
     },
     "name": "composite.substep1",
@@ -153,7 +153,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000016.0
+        "soft_deadline": 1337000020.5
       }
     },
     "name": "composite.substep2",
diff --git a/recipes/build.expected/basic.json b/recipes/build.expected/basic.json
index e5f706b..6f9ae16 100644
--- a/recipes/build.expected/basic.json
+++ b/recipes/build.expected/basic.json
@@ -599,7 +599,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:ci"
@@ -1471,7 +1471,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000020.5
+        "soft_deadline": 1337000031.0
       },
       "realm": {
         "name": "project:ci"
diff --git a/recipes/build.expected/skip_archive.json b/recipes/build.expected/skip_archive.json
index 760f09d..94e7c67 100644
--- a/recipes/build.expected/skip_archive.json
+++ b/recipes/build.expected/skip_archive.json
@@ -599,7 +599,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:ci"
@@ -1471,7 +1471,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000020.5
+        "soft_deadline": 1337000031.0
       },
       "realm": {
         "name": "project:ci"
diff --git a/recipes/cipd_roller.expected/bad_package_spec.json b/recipes/cipd_roller.expected/bad_package_spec.json
index 58ab684..75fa933 100644
--- a/recipes/cipd_roller.expected/bad_package_spec.json
+++ b/recipes/cipd_roller.expected/bad_package_spec.json
@@ -403,7 +403,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:ci"
diff --git a/recipes/cipd_roller.expected/missing_tag.json b/recipes/cipd_roller.expected/missing_tag.json
index 3d34aac..841b6e2 100644
--- a/recipes/cipd_roller.expected/missing_tag.json
+++ b/recipes/cipd_roller.expected/missing_tag.json
@@ -403,7 +403,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:ci"
diff --git a/recipes/cipd_roller.expected/multiple_common_tags.json b/recipes/cipd_roller.expected/multiple_common_tags.json
index ec2fa85..6bfb692 100644
--- a/recipes/cipd_roller.expected/multiple_common_tags.json
+++ b/recipes/cipd_roller.expected/multiple_common_tags.json
@@ -403,7 +403,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:ci"
diff --git a/recipes/cipd_roller.expected/no_common_tags.json b/recipes/cipd_roller.expected/no_common_tags.json
index 71b6b1b..d7685c5 100644
--- a/recipes/cipd_roller.expected/no_common_tags.json
+++ b/recipes/cipd_roller.expected/no_common_tags.json
@@ -403,7 +403,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:ci"
diff --git a/recipes/cipd_roller.expected/no_common_tags_and_relaxing_ref_mismatch_does_not_help.json b/recipes/cipd_roller.expected/no_common_tags_and_relaxing_ref_mismatch_does_not_help.json
index 06057c5..7d8eef9 100644
--- a/recipes/cipd_roller.expected/no_common_tags_and_relaxing_ref_mismatch_does_not_help.json
+++ b/recipes/cipd_roller.expected/no_common_tags_and_relaxing_ref_mismatch_does_not_help.json
@@ -403,7 +403,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:ci"
diff --git a/recipes/cipd_roller.expected/no_common_tags_but_relaxing_ref_mismatch_helps.json b/recipes/cipd_roller.expected/no_common_tags_but_relaxing_ref_mismatch_helps.json
index 57546cb..44c833f 100644
--- a/recipes/cipd_roller.expected/no_common_tags_but_relaxing_ref_mismatch_helps.json
+++ b/recipes/cipd_roller.expected/no_common_tags_but_relaxing_ref_mismatch_helps.json
@@ -403,7 +403,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:ci"
diff --git a/recipes/cipd_roller.expected/no_curlies_in_spec.json b/recipes/cipd_roller.expected/no_curlies_in_spec.json
index 1969706..b1e17cc 100644
--- a/recipes/cipd_roller.expected/no_curlies_in_spec.json
+++ b/recipes/cipd_roller.expected/no_curlies_in_spec.json
@@ -403,7 +403,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:ci"
diff --git a/recipes/cipd_roller.expected/platform-independent.json b/recipes/cipd_roller.expected/platform-independent.json
index 10fa2ee..8b6498b 100644
--- a/recipes/cipd_roller.expected/platform-independent.json
+++ b/recipes/cipd_roller.expected/platform-independent.json
@@ -403,7 +403,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:ci"
diff --git a/recipes/cipd_roller.expected/success.json b/recipes/cipd_roller.expected/success.json
index 6cdd2c1..fe4113a 100644
--- a/recipes/cipd_roller.expected/success.json
+++ b/recipes/cipd_roller.expected/success.json
@@ -403,7 +403,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:ci"
diff --git a/recipes/docs_builder.expected/docs-dry_run-build.json b/recipes/docs_builder.expected/docs-dry_run-build.json
index 32f6973..b6cb3ef 100644
--- a/recipes/docs_builder.expected/docs-dry_run-build.json
+++ b/recipes/docs_builder.expected/docs-dry_run-build.json
@@ -416,7 +416,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       }
     },
     "name": "checkout pigweed.git checkout.makedirs",
@@ -942,7 +942,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000020.5
+        "soft_deadline": 1337000031.0
       }
     },
     "name": "ninja"
@@ -1046,7 +1046,7 @@
     "cmd": [
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-h",
-      "Custom-Time:2012-05-14T12:53:32.000000Z",
+      "Custom-Time:2012-05-14T12:53:42.500000Z",
       "-o",
       "GSUtil:software_update_check_period=0",
       "-m",
diff --git a/recipes/docs_builder.expected/docs-postsubmit.json b/recipes/docs_builder.expected/docs-postsubmit.json
index cc31d62..eb3f542 100644
--- a/recipes/docs_builder.expected/docs-postsubmit.json
+++ b/recipes/docs_builder.expected/docs-postsubmit.json
@@ -416,7 +416,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       }
     },
     "name": "checkout pigweed.git checkout.makedirs",
@@ -949,7 +949,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000022.0
+        "soft_deadline": 1337000032.5
       }
     },
     "name": "get steps from programs.get steps",
@@ -1030,7 +1030,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000023.5
+        "soft_deadline": 1337000035.5
       }
     },
     "name": "step.step",
@@ -1891,7 +1891,7 @@
     "cmd": [
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-h",
-      "Custom-Time:2012-05-14T12:53:35.000000Z",
+      "Custom-Time:2012-05-14T12:53:47.000000Z",
       "-o",
       "GSUtil:software_update_check_period=0",
       "-m",
@@ -1954,7 +1954,7 @@
     "cmd": [
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-h",
-      "Custom-Time:2012-05-14T12:53:36.500000Z",
+      "Custom-Time:2012-05-14T12:53:48.500000Z",
       "-o",
       "GSUtil:software_update_check_period=0",
       "cp",
@@ -1971,7 +1971,7 @@
     "cmd": [
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-h",
-      "Custom-Time:2012-05-14T12:53:38.000000Z",
+      "Custom-Time:2012-05-14T12:53:50.000000Z",
       "-o",
       "GSUtil:software_update_check_period=0",
       "-m",
diff --git a/recipes/docs_builder.expected/docs-presubmit.json b/recipes/docs_builder.expected/docs-presubmit.json
index 40be5ac..991e54c 100644
--- a/recipes/docs_builder.expected/docs-presubmit.json
+++ b/recipes/docs_builder.expected/docs-presubmit.json
@@ -811,7 +811,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:try"
@@ -1742,7 +1742,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000022.0
+        "soft_deadline": 1337000032.5
       },
       "realm": {
         "name": "project:try"
@@ -1856,7 +1856,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000023.5
+        "soft_deadline": 1337000035.5
       },
       "realm": {
         "name": "project:try"
@@ -3109,7 +3109,7 @@
     "cmd": [
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-h",
-      "Custom-Time:2012-05-14T12:53:35.000000Z",
+      "Custom-Time:2012-05-14T12:53:47.000000Z",
       "-o",
       "GSUtil:software_update_check_period=0",
       "-m",
diff --git a/recipes/envtest.expected/environment_variables.json b/recipes/envtest.expected/environment_variables.json
index 6861d3d..6af66a4 100644
--- a/recipes/envtest.expected/environment_variables.json
+++ b/recipes/envtest.expected/environment_variables.json
@@ -416,7 +416,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       }
     },
     "name": "checkout pigweed.git checkout.makedirs",
diff --git a/recipes/envtest.expected/fail.json b/recipes/envtest.expected/fail.json
index 40781f4..1f4ae52 100644
--- a/recipes/envtest.expected/fail.json
+++ b/recipes/envtest.expected/fail.json
@@ -599,7 +599,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:ci"
diff --git a/recipes/envtest.expected/pigweed.json b/recipes/envtest.expected/pigweed.json
index 815ed65..9e6198b 100644
--- a/recipes/envtest.expected/pigweed.json
+++ b/recipes/envtest.expected/pigweed.json
@@ -599,7 +599,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:ci"
diff --git a/recipes/envtest.expected/windows.json b/recipes/envtest.expected/windows.json
index f6ba0a6..a299002 100644
--- a/recipes/envtest.expected/windows.json
+++ b/recipes/envtest.expected/windows.json
@@ -599,7 +599,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:ci"
diff --git a/recipes/luci_config.expected/starlark.json b/recipes/luci_config.expected/starlark.json
index 355f2b2..bfa466b 100644
--- a/recipes/luci_config.expected/starlark.json
+++ b/recipes/luci_config.expected/starlark.json
@@ -811,7 +811,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:try"
diff --git a/recipes/pw_presubmit.expected/one_step.json b/recipes/pw_presubmit.expected/one_step.json
index 4a25374..0f80737 100644
--- a/recipes/pw_presubmit.expected/one_step.json
+++ b/recipes/pw_presubmit.expected/one_step.json
@@ -811,7 +811,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:try"
@@ -1742,7 +1742,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000022.0
+        "soft_deadline": 1337000032.5
       },
       "realm": {
         "name": "project:try"
@@ -1856,7 +1856,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000023.5
+        "soft_deadline": 1337000035.5
       },
       "realm": {
         "name": "project:try"
diff --git a/recipes/pw_presubmit.expected/sign.json b/recipes/pw_presubmit.expected/sign.json
index b55c722..3f5d0c3 100644
--- a/recipes/pw_presubmit.expected/sign.json
+++ b/recipes/pw_presubmit.expected/sign.json
@@ -599,7 +599,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:ci"
@@ -1477,7 +1477,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000022.0
+        "soft_deadline": 1337000032.5
       },
       "realm": {
         "name": "project:ci"
@@ -1591,7 +1591,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000023.5
+        "soft_deadline": 1337000035.5
       },
       "realm": {
         "name": "project:ci"
@@ -3069,7 +3069,7 @@
     "cmd": [
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-h",
-      "Custom-Time:2012-05-14T12:53:35.000000Z",
+      "Custom-Time:2012-05-14T12:53:47.000000Z",
       "-o",
       "GSUtil:software_update_check_period=0",
       "-m",
@@ -3102,7 +3102,7 @@
     "cmd": [
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-h",
-      "Custom-Time:2012-05-14T12:53:36.500000Z",
+      "Custom-Time:2012-05-14T12:53:48.500000Z",
       "-o",
       "GSUtil:software_update_check_period=0",
       "cp",
@@ -3133,7 +3133,7 @@
     "cmd": [
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-h",
-      "Custom-Time:2012-05-14T12:53:38.000000Z",
+      "Custom-Time:2012-05-14T12:53:50.000000Z",
       "-o",
       "GSUtil:software_update_check_period=0",
       "cp",
@@ -3164,7 +3164,7 @@
     "cmd": [
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-h",
-      "Custom-Time:2012-05-14T12:53:39.500000Z",
+      "Custom-Time:2012-05-14T12:53:51.500000Z",
       "-h",
       "x-goog-meta-signature:John Hancock",
       "-o",
@@ -3197,7 +3197,7 @@
     "cmd": [
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-h",
-      "Custom-Time:2012-05-14T12:53:41.000000Z",
+      "Custom-Time:2012-05-14T12:53:53.000000Z",
       "-o",
       "GSUtil:software_update_check_period=0",
       "cp",
@@ -3228,7 +3228,7 @@
     "cmd": [
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-h",
-      "Custom-Time:2012-05-14T12:53:42.500000Z",
+      "Custom-Time:2012-05-14T12:53:54.500000Z",
       "-o",
       "GSUtil:software_update_check_period=0",
       "cp",
diff --git a/recipes/pw_presubmit.expected/two_steps.json b/recipes/pw_presubmit.expected/two_steps.json
index 5e85f85..7fb953b 100644
--- a/recipes/pw_presubmit.expected/two_steps.json
+++ b/recipes/pw_presubmit.expected/two_steps.json
@@ -811,7 +811,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1600000070.0
+        "soft_deadline": 1600000130.0
       },
       "realm": {
         "name": "project:try"
@@ -1744,7 +1744,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1600000170.0
+        "soft_deadline": 1600000310.0
       },
       "realm": {
         "name": "project:try"
@@ -1862,7 +1862,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1600000190.0
+        "soft_deadline": 1600000350.0
       },
       "realm": {
         "name": "project:try"
@@ -3045,7 +3045,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1600000210.0
+        "soft_deadline": 1600000390.0
       },
       "realm": {
         "name": "project:try"
@@ -4525,7 +4525,7 @@
     "cmd": [
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-h",
-      "Custom-Time:2020-09-13T12:30:20.000000Z",
+      "Custom-Time:2020-09-13T12:33:20.000000Z",
       "-o",
       "GSUtil:software_update_check_period=0",
       "-m",
@@ -4558,7 +4558,7 @@
     "cmd": [
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-h",
-      "Custom-Time:2020-09-13T12:30:40.000000Z",
+      "Custom-Time:2020-09-13T12:33:40.000000Z",
       "-o",
       "GSUtil:software_update_check_period=0",
       "cp",
@@ -4589,7 +4589,7 @@
     "cmd": [
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-h",
-      "Custom-Time:2020-09-13T12:31:00.000000Z",
+      "Custom-Time:2020-09-13T12:34:00.000000Z",
       "-o",
       "GSUtil:software_update_check_period=0",
       "cp",
@@ -4620,7 +4620,7 @@
     "cmd": [
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-h",
-      "Custom-Time:2020-09-13T12:31:20.000000Z",
+      "Custom-Time:2020-09-13T12:34:20.000000Z",
       "-o",
       "GSUtil:software_update_check_period=0",
       "cp",
diff --git a/recipes/recipes.expected/cq_try.json b/recipes/recipes.expected/cq_try.json
index bddf46d..e0dd91a 100644
--- a/recipes/recipes.expected/cq_try.json
+++ b/recipes/recipes.expected/cq_try.json
@@ -811,7 +811,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:try"
diff --git a/recipes/repo_roller.expected/backwards.json b/recipes/repo_roller.expected/backwards.json
index 3b7aae3..904c497 100644
--- a/recipes/repo_roller.expected/backwards.json
+++ b/recipes/repo_roller.expected/backwards.json
@@ -403,7 +403,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:ci"
@@ -1257,7 +1257,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000019.0
+        "soft_deadline": 1337000028.0
       },
       "realm": {
         "name": "project:ci"
diff --git a/recipes/repo_roller.expected/dotdot-prefix.json b/recipes/repo_roller.expected/dotdot-prefix.json
index 4a99800..4b5fff3 100644
--- a/recipes/repo_roller.expected/dotdot-prefix.json
+++ b/recipes/repo_roller.expected/dotdot-prefix.json
@@ -403,7 +403,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:ci"
@@ -1257,7 +1257,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000019.0
+        "soft_deadline": 1337000028.0
       },
       "realm": {
         "name": "project:ci"
diff --git a/recipes/repo_roller.expected/equivalent.json b/recipes/repo_roller.expected/equivalent.json
index 1f28bc4..3c2a0a6 100644
--- a/recipes/repo_roller.expected/equivalent.json
+++ b/recipes/repo_roller.expected/equivalent.json
@@ -403,7 +403,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:ci"
@@ -1257,7 +1257,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000019.0
+        "soft_deadline": 1337000028.0
       },
       "realm": {
         "name": "project:ci"
diff --git a/recipes/repo_roller.expected/host-dot-dot.json b/recipes/repo_roller.expected/host-dot-dot.json
index 2ae0677..ed7b51f 100644
--- a/recipes/repo_roller.expected/host-dot-dot.json
+++ b/recipes/repo_roller.expected/host-dot-dot.json
@@ -403,7 +403,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:ci"
@@ -1257,7 +1257,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000019.0
+        "soft_deadline": 1337000028.0
       },
       "realm": {
         "name": "project:ci"
diff --git a/recipes/repo_roller.expected/host-prefix.json b/recipes/repo_roller.expected/host-prefix.json
index 0a33c53..d53a39e 100644
--- a/recipes/repo_roller.expected/host-prefix.json
+++ b/recipes/repo_roller.expected/host-prefix.json
@@ -403,7 +403,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:ci"
@@ -1257,7 +1257,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000019.0
+        "soft_deadline": 1337000028.0
       },
       "realm": {
         "name": "project:ci"
diff --git a/recipes/repo_roller.expected/name-not-found.json b/recipes/repo_roller.expected/name-not-found.json
index 164cbc5..30433f0 100644
--- a/recipes/repo_roller.expected/name-not-found.json
+++ b/recipes/repo_roller.expected/name-not-found.json
@@ -403,7 +403,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:ci"
diff --git a/recipes/repo_roller.expected/no-trigger-with-revision-branch.json b/recipes/repo_roller.expected/no-trigger-with-revision-branch.json
index f9a1d08..7d65739 100644
--- a/recipes/repo_roller.expected/no-trigger-with-revision-branch.json
+++ b/recipes/repo_roller.expected/no-trigger-with-revision-branch.json
@@ -259,7 +259,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       }
     },
     "name": "checkout manifest.git checkout.makedirs",
@@ -791,7 +791,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000019.0
+        "soft_deadline": 1337000028.0
       }
     },
     "name": "checkout c.git checkout.makedirs",
diff --git a/recipes/repo_roller.expected/no-trigger-with-revision-hash.json b/recipes/repo_roller.expected/no-trigger-with-revision-hash.json
index dcf7b26..1f35cea 100644
--- a/recipes/repo_roller.expected/no-trigger-with-revision-hash.json
+++ b/recipes/repo_roller.expected/no-trigger-with-revision-hash.json
@@ -259,7 +259,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       }
     },
     "name": "checkout manifest.git checkout.makedirs",
@@ -791,7 +791,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000019.0
+        "soft_deadline": 1337000028.0
       }
     },
     "name": "checkout d.git checkout.makedirs",
diff --git a/recipes/repo_roller.expected/no-trigger-with-revision-tag.json b/recipes/repo_roller.expected/no-trigger-with-revision-tag.json
index 2beb084..543bcd6 100644
--- a/recipes/repo_roller.expected/no-trigger-with-revision-tag.json
+++ b/recipes/repo_roller.expected/no-trigger-with-revision-tag.json
@@ -259,7 +259,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       }
     },
     "name": "checkout manifest.git checkout.makedirs",
@@ -791,7 +791,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000019.0
+        "soft_deadline": 1337000028.0
       }
     },
     "name": "checkout e5.git checkout.makedirs",
diff --git a/recipes/repo_roller.expected/no-trigger-with-upstream.json b/recipes/repo_roller.expected/no-trigger-with-upstream.json
index 5bce182..53c0c0f 100644
--- a/recipes/repo_roller.expected/no-trigger-with-upstream.json
+++ b/recipes/repo_roller.expected/no-trigger-with-upstream.json
@@ -259,7 +259,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       }
     },
     "name": "checkout manifest.git checkout.makedirs",
@@ -791,7 +791,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000019.0
+        "soft_deadline": 1337000028.0
       }
     },
     "name": "checkout a.git checkout.makedirs",
diff --git a/recipes/repo_roller.expected/success.json b/recipes/repo_roller.expected/success.json
index ca3f929..59ee8d7 100644
--- a/recipes/repo_roller.expected/success.json
+++ b/recipes/repo_roller.expected/success.json
@@ -403,7 +403,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:ci"
@@ -1257,7 +1257,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000019.0
+        "soft_deadline": 1337000028.0
       },
       "realm": {
         "name": "project:ci"
diff --git a/recipes/repo_roller.expected/upstream-not-set-revision-not-branch.json b/recipes/repo_roller.expected/upstream-not-set-revision-not-branch.json
index 2914c70..72158a5 100644
--- a/recipes/repo_roller.expected/upstream-not-set-revision-not-branch.json
+++ b/recipes/repo_roller.expected/upstream-not-set-revision-not-branch.json
@@ -403,7 +403,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:ci"
diff --git a/recipes/repo_roller.expected/upstream-not-set.json b/recipes/repo_roller.expected/upstream-not-set.json
index ad27550..96643d9 100644
--- a/recipes/repo_roller.expected/upstream-not-set.json
+++ b/recipes/repo_roller.expected/upstream-not-set.json
@@ -403,7 +403,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:ci"
@@ -1257,7 +1257,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000019.0
+        "soft_deadline": 1337000028.0
       },
       "realm": {
         "name": "project:ci"
diff --git a/recipes/run_script.expected/run_script.json b/recipes/run_script.expected/run_script.json
index 82f7179..20b01b1 100644
--- a/recipes/run_script.expected/run_script.json
+++ b/recipes/run_script.expected/run_script.json
@@ -416,7 +416,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       }
     },
     "name": "checkout pigweed.git checkout.makedirs",
diff --git a/recipes/run_script.expected/variable_substitution.json b/recipes/run_script.expected/variable_substitution.json
index 00c830e..d611ab9 100644
--- a/recipes/run_script.expected/variable_substitution.json
+++ b/recipes/run_script.expected/variable_substitution.json
@@ -416,7 +416,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       }
     },
     "name": "checkout pigweed.git checkout.makedirs",
diff --git a/recipes/submodule_roller.expected/missing.json b/recipes/submodule_roller.expected/missing.json
index a74e545..3c9f5ae 100644
--- a/recipes/submodule_roller.expected/missing.json
+++ b/recipes/submodule_roller.expected/missing.json
@@ -259,7 +259,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       }
     },
     "name": "checkout pigweed.git checkout.makedirs",
diff --git a/recipes/submodule_roller.expected/noop.json b/recipes/submodule_roller.expected/noop.json
index 3d9cdc0..e81aa58 100644
--- a/recipes/submodule_roller.expected/noop.json
+++ b/recipes/submodule_roller.expected/noop.json
@@ -259,7 +259,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       }
     },
     "name": "checkout pigweed.git checkout.makedirs",
diff --git a/recipes/submodule_roller.expected/partial_noop.json b/recipes/submodule_roller.expected/partial_noop.json
index bdd3cd6..60b22ed 100644
--- a/recipes/submodule_roller.expected/partial_noop.json
+++ b/recipes/submodule_roller.expected/partial_noop.json
@@ -259,7 +259,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       }
     },
     "name": "checkout pigweed.git checkout.makedirs",
diff --git a/recipes/submodule_roller.expected/success.json b/recipes/submodule_roller.expected/success.json
index d1254ab..d073d1f 100644
--- a/recipes/submodule_roller.expected/success.json
+++ b/recipes/submodule_roller.expected/success.json
@@ -259,7 +259,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       }
     },
     "name": "checkout pigweed.git checkout.makedirs",
diff --git a/recipes/target_to_cipd.expected/pw-presubmit.json b/recipes/target_to_cipd.expected/pw-presubmit.json
index 003a7b0..34b770d 100644
--- a/recipes/target_to_cipd.expected/pw-presubmit.json
+++ b/recipes/target_to_cipd.expected/pw-presubmit.json
@@ -416,7 +416,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       }
     },
     "name": "checkout pigweed.git checkout.makedirs",
@@ -949,7 +949,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000022.0
+        "soft_deadline": 1337000032.5
       }
     },
     "name": "get steps from programs.get steps",
@@ -1030,7 +1030,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000023.5
+        "soft_deadline": 1337000035.5
       }
     },
     "name": "step.step",
@@ -1936,7 +1936,7 @@
     ],
     "infra_step": true,
     "name": "trigger ROLL",
-    "stdin": "{\"batches\": [{\"jobs\": [{\"job\": \"ROLL\", \"project\": \"\"}], \"trigger\": {\"gitiles\": {\"ref\": \"refs/heads/main\", \"repo\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"revision\": \"h3ll0\", \"tags\": [\"user_agent:recipe\"]}, \"id\": \"6a0a73b0-070b-492b-9135-9f26a2a00001\", \"title\": \"/0\"}}], \"timestamp\": 1337000015000000}",
+    "stdin": "{\"batches\": [{\"jobs\": [{\"job\": \"ROLL\", \"project\": \"\"}], \"trigger\": {\"gitiles\": {\"ref\": \"refs/heads/main\", \"repo\": \"https://pigweed.googlesource.com/pigweed/pigweed\", \"revision\": \"h3ll0\", \"tags\": [\"user_agent:recipe\"]}, \"id\": \"6a0a73b0-070b-492b-9135-9f26a2a00001\", \"title\": \"/0\"}}], \"timestamp\": 1337000027000000}",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@input@{@@@",
       "@@@STEP_LOG_LINE@input@    \"batches\": [@@@",
@@ -1961,7 +1961,7 @@
       "@@@STEP_LOG_LINE@input@            }@@@",
       "@@@STEP_LOG_LINE@input@        }@@@",
       "@@@STEP_LOG_LINE@input@    ], @@@",
-      "@@@STEP_LOG_LINE@input@    \"timestamp\": 1337000015000000@@@",
+      "@@@STEP_LOG_LINE@input@    \"timestamp\": 1337000027000000@@@",
       "@@@STEP_LOG_LINE@input@}@@@",
       "@@@STEP_LOG_END@input@@@"
     ]
diff --git a/recipes/target_to_cipd.expected/success.json b/recipes/target_to_cipd.expected/success.json
index e2cc2a2..2538935 100644
--- a/recipes/target_to_cipd.expected/success.json
+++ b/recipes/target_to_cipd.expected/success.json
@@ -1150,7 +1150,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000016.0
+        "soft_deadline": 1337000022.0
       },
       "realm": {
         "name": "project:ci"
@@ -1493,7 +1493,7 @@
       }
     },
     "name": "trigger ROLL",
-    "stdin": "{\"batches\": [{\"jobs\": [{\"job\": \"ROLL\", \"project\": \"project\"}], \"trigger\": {\"gitiles\": {\"ref\": \"refs/heads/main\", \"repo\": \"https://pigweed.googlesource.com/pigweed/manifest\", \"revision\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"tags\": [\"parent_buildername:builder\", \"user_agent:recipe\"]}, \"id\": \"6a0a73b0-070b-492b-9135-9f26a2a00001\", \"title\": \"builder/0\"}}], \"timestamp\": 1337000007500000}",
+    "stdin": "{\"batches\": [{\"jobs\": [{\"job\": \"ROLL\", \"project\": \"project\"}], \"trigger\": {\"gitiles\": {\"ref\": \"refs/heads/main\", \"repo\": \"https://pigweed.googlesource.com/pigweed/manifest\", \"revision\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"tags\": [\"parent_buildername:builder\", \"user_agent:recipe\"]}, \"id\": \"6a0a73b0-070b-492b-9135-9f26a2a00001\", \"title\": \"builder/0\"}}], \"timestamp\": 1337000013500000}",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@input@{@@@",
       "@@@STEP_LOG_LINE@input@    \"batches\": [@@@",
@@ -1519,7 +1519,7 @@
       "@@@STEP_LOG_LINE@input@            }@@@",
       "@@@STEP_LOG_LINE@input@        }@@@",
       "@@@STEP_LOG_LINE@input@    ], @@@",
-      "@@@STEP_LOG_LINE@input@    \"timestamp\": 1337000007500000@@@",
+      "@@@STEP_LOG_LINE@input@    \"timestamp\": 1337000013500000@@@",
       "@@@STEP_LOG_LINE@input@}@@@",
       "@@@STEP_LOG_END@input@@@"
     ]
diff --git a/recipes/tokendb_check.expected/addition.json b/recipes/tokendb_check.expected/addition.json
index b8b8e7c..973fe1b 100644
--- a/recipes/tokendb_check.expected/addition.json
+++ b/recipes/tokendb_check.expected/addition.json
@@ -936,7 +936,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:try"
diff --git a/recipes/tokendb_check.expected/no-change.json b/recipes/tokendb_check.expected/no-change.json
index ddbedd9..813c8ba 100644
--- a/recipes/tokendb_check.expected/no-change.json
+++ b/recipes/tokendb_check.expected/no-change.json
@@ -936,7 +936,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:try"
diff --git a/recipes/tokendb_check.expected/removal.json b/recipes/tokendb_check.expected/removal.json
index 6e48877..8d5bcc5 100644
--- a/recipes/tokendb_check.expected/removal.json
+++ b/recipes/tokendb_check.expected/removal.json
@@ -936,7 +936,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:try"
diff --git a/recipes/tokendb_check.expected/update.json b/recipes/tokendb_check.expected/update.json
index 3f01e86..c4adba9 100644
--- a/recipes/tokendb_check.expected/update.json
+++ b/recipes/tokendb_check.expected/update.json
@@ -936,7 +936,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:try"
diff --git a/recipes/tokendb_updater.expected/dry-run.json b/recipes/tokendb_updater.expected/dry-run.json
index e9f2fe8..f41188d 100644
--- a/recipes/tokendb_updater.expected/dry-run.json
+++ b/recipes/tokendb_updater.expected/dry-run.json
@@ -416,7 +416,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       }
     },
     "name": "checkout pigweed.git checkout.makedirs",
@@ -942,7 +942,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000020.5
+        "soft_deadline": 1337000031.0
       }
     },
     "name": "ninja"
diff --git a/recipes/tokendb_updater.expected/simple.json b/recipes/tokendb_updater.expected/simple.json
index a780347..7a1918f 100644
--- a/recipes/tokendb_updater.expected/simple.json
+++ b/recipes/tokendb_updater.expected/simple.json
@@ -416,7 +416,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       }
     },
     "name": "checkout pigweed.git checkout.makedirs",
@@ -942,7 +942,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000020.5
+        "soft_deadline": 1337000031.0
       }
     },
     "name": "ninja"
diff --git a/recipes/txt_roller.expected/backwards.json b/recipes/txt_roller.expected/backwards.json
index 037e5bc..f5a5537 100644
--- a/recipes/txt_roller.expected/backwards.json
+++ b/recipes/txt_roller.expected/backwards.json
@@ -259,7 +259,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       }
     },
     "name": "checkout pigweed.git checkout.makedirs",
@@ -904,7 +904,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000019.0
+        "soft_deadline": 1337000028.0
       }
     },
     "name": "checkout foo.git checkout.makedirs",
diff --git a/recipes/txt_roller.expected/bad-trigger.json b/recipes/txt_roller.expected/bad-trigger.json
index ddf3a83..3066feb 100644
--- a/recipes/txt_roller.expected/bad-trigger.json
+++ b/recipes/txt_roller.expected/bad-trigger.json
@@ -403,7 +403,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:ci"
diff --git a/recipes/txt_roller.expected/no-trigger.json b/recipes/txt_roller.expected/no-trigger.json
index b4dedcf..feccd35 100644
--- a/recipes/txt_roller.expected/no-trigger.json
+++ b/recipes/txt_roller.expected/no-trigger.json
@@ -259,7 +259,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       }
     },
     "name": "checkout pigweed.git checkout.makedirs",
@@ -904,7 +904,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000019.0
+        "soft_deadline": 1337000028.0
       }
     },
     "name": "checkout foo.git checkout.makedirs",
diff --git a/recipes/txt_roller.expected/success.json b/recipes/txt_roller.expected/success.json
index 59791ec..97bf6bf 100644
--- a/recipes/txt_roller.expected/success.json
+++ b/recipes/txt_roller.expected/success.json
@@ -403,7 +403,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:ci"
@@ -1397,7 +1397,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000019.0
+        "soft_deadline": 1337000028.0
       },
       "realm": {
         "name": "project:ci"
diff --git a/recipes/update_python_versions.expected/simple.json b/recipes/update_python_versions.expected/simple.json
index 1612a0c..02eb471 100644
--- a/recipes/update_python_versions.expected/simple.json
+++ b/recipes/update_python_versions.expected/simple.json
@@ -416,7 +416,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       }
     },
     "name": "checkout pigweed.git checkout.makedirs",
diff --git a/recipes/xrefs.expected/dry_run.json b/recipes/xrefs.expected/dry_run.json
index 8a025c0..714d2e1 100644
--- a/recipes/xrefs.expected/dry_run.json
+++ b/recipes/xrefs.expected/dry_run.json
@@ -416,7 +416,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       }
     },
     "name": "checkout pigweed.git checkout.makedirs",
@@ -1098,7 +1098,7 @@
     "cmd": [
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-h",
-      "Custom-Time:2012-05-14T12:53:30.500000Z",
+      "Custom-Time:2012-05-14T12:53:39.500000Z",
       "-o",
       "GSUtil:software_update_check_period=0",
       "cp",
diff --git a/recipes/xrefs.expected/kythe.json b/recipes/xrefs.expected/kythe.json
index f501784..155dad9 100644
--- a/recipes/xrefs.expected/kythe.json
+++ b/recipes/xrefs.expected/kythe.json
@@ -416,7 +416,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       }
     },
     "name": "checkout pigweed.git checkout.makedirs",
@@ -1098,7 +1098,7 @@
     "cmd": [
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-h",
-      "Custom-Time:2012-05-14T12:53:30.500000Z",
+      "Custom-Time:2012-05-14T12:53:39.500000Z",
       "-o",
       "GSUtil:software_update_check_period=0",
       "cp",
diff --git a/recipes/xrefs.expected/tryjob.json b/recipes/xrefs.expected/tryjob.json
index 70dcc66..4246f0c 100644
--- a/recipes/xrefs.expected/tryjob.json
+++ b/recipes/xrefs.expected/tryjob.json
@@ -811,7 +811,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1337000014.5
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:try"
@@ -2000,7 +2000,7 @@
     "cmd": [
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-h",
-      "Custom-Time:2012-05-14T12:53:30.500000Z",
+      "Custom-Time:2012-05-14T12:53:39.500000Z",
       "-o",
       "GSUtil:software_update_check_period=0",
       "cp",