diff --git a/test_suites/control.AFDO_record b/test_suites/control.AFDO_record
index 15e6c1a..e5d2820 100644
--- a/test_suites/control.AFDO_record
+++ b/test_suites/control.AFDO_record
@@ -57,4 +57,4 @@
     devserver_url=devserver_url, timeout_mins=timeout_mins,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.PGO_record b/test_suites/control.PGO_record
index afd0342..14f2acf 100644
--- a/test_suites/control.PGO_record
+++ b/test_suites/control.PGO_record
@@ -55,4 +55,4 @@
     devserver_url=devserver_url, timeout_mins=timeout_mins,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
\ No newline at end of file
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
\ No newline at end of file
diff --git a/test_suites/control.au b/test_suites/control.au
index 99e299d..31c1f5c 100644
--- a/test_suites/control.au
+++ b/test_suites/control.au
@@ -60,4 +60,4 @@
     devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.audio b/test_suites/control.audio
index 6aa60c2..ba16f4c 100644
--- a/test_suites/control.audio
+++ b/test_suites/control.audio
@@ -35,4 +35,4 @@
     max_runtime_mins=60, devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.bluetooth b/test_suites/control.bluetooth
index e86eafb..a35d334 100644
--- a/test_suites/control.bluetooth
+++ b/test_suites/control.bluetooth
@@ -28,4 +28,4 @@
     file_bugs=file_bugs, priority=priority, timeout_mins=timeout_mins,
     devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
\ No newline at end of file
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
\ No newline at end of file
diff --git a/test_suites/control.bluetooth_qualification b/test_suites/control.bluetooth_qualification
index e8d8ee1..8c3e102 100644
--- a/test_suites/control.bluetooth_qualification
+++ b/test_suites/control.bluetooth_qualification
@@ -27,4 +27,4 @@
     file_bugs=file_bugs, priority=priority, timeout_mins=timeout_mins,
     devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.bluetooth_sanity b/test_suites/control.bluetooth_sanity
index b794664..37da6d4 100644
--- a/test_suites/control.bluetooth_sanity
+++ b/test_suites/control.bluetooth_sanity
@@ -28,4 +28,4 @@
     file_bugs=file_bugs, priority=priority, timeout_mins=timeout_mins,
     devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
\ No newline at end of file
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
\ No newline at end of file
diff --git a/test_suites/control.browsertests b/test_suites/control.browsertests
index 0b02f3b..b4e932b 100644
--- a/test_suites/control.browsertests
+++ b/test_suites/control.browsertests
@@ -36,4 +36,4 @@
     file_bugs=file_bugs, priority=priority, timeout_mins=timeout_mins,
     devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
\ No newline at end of file
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
\ No newline at end of file
diff --git a/test_suites/control.bvt-cq b/test_suites/control.bvt-cq
index cbf0c2e..a7b1e63 100644
--- a/test_suites/control.bvt-cq
+++ b/test_suites/control.bvt-cq
@@ -62,4 +62,4 @@
     max_runtime_mins=20, bug_template=_BUG_TEMPLATE,
     devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.bvt-inline b/test_suites/control.bvt-inline
index 97f2a51..938f842 100644
--- a/test_suites/control.bvt-inline
+++ b/test_suites/control.bvt-inline
@@ -66,4 +66,4 @@
     max_runtime_mins=20, bug_template=_BUG_TEMPLATE,
     devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.bvt-perbuild b/test_suites/control.bvt-perbuild
index 5656675..56bd0aa 100644
--- a/test_suites/control.bvt-perbuild
+++ b/test_suites/control.bvt-perbuild
@@ -59,4 +59,4 @@
     max_runtime_mins=20, bug_template=_BUG_TEMPLATE,
     devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.cast b/test_suites/control.cast
index 92e7e16..ea35e60 100644
--- a/test_suites/control.cast
+++ b/test_suites/control.cast
@@ -35,4 +35,4 @@
     max_runtime_mins=60, devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.cellular_mbim_compliance b/test_suites/control.cellular_mbim_compliance
index 8897d34..8d32e9c 100644
--- a/test_suites/control.cellular_mbim_compliance
+++ b/test_suites/control.cellular_mbim_compliance
@@ -44,4 +44,4 @@
     devserver_url=devserver_url, suite_dependencies='modem_repair',
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.cellular_modem_repair b/test_suites/control.cellular_modem_repair
index d261050..8a758c0 100644
--- a/test_suites/control.cellular_modem_repair
+++ b/test_suites/control.cellular_modem_repair
@@ -31,4 +31,4 @@
     suite_dependencies='modem_repair',
     devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.chameleon_dp b/test_suites/control.chameleon_dp
index 3efeac4..c14da2e 100644
--- a/test_suites/control.chameleon_dp
+++ b/test_suites/control.chameleon_dp
@@ -52,4 +52,4 @@
     devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.chameleon_dp_weekly b/test_suites/control.chameleon_dp_weekly
index dc38cb7..d54a22e 100644
--- a/test_suites/control.chameleon_dp_weekly
+++ b/test_suites/control.chameleon_dp_weekly
@@ -52,4 +52,4 @@
     devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.chameleon_hdmi b/test_suites/control.chameleon_hdmi
index 08e6b90..4e5d72b 100644
--- a/test_suites/control.chameleon_hdmi
+++ b/test_suites/control.chameleon_hdmi
@@ -52,4 +52,4 @@
     devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.chameleon_hdmi_weekly b/test_suites/control.chameleon_hdmi_weekly
index 089d709..7d14a4e 100644
--- a/test_suites/control.chameleon_hdmi_weekly
+++ b/test_suites/control.chameleon_hdmi_weekly
@@ -52,4 +52,4 @@
     devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.chameleon_vga b/test_suites/control.chameleon_vga
index e9caa83..2a7798c 100644
--- a/test_suites/control.chameleon_vga
+++ b/test_suites/control.chameleon_vga
@@ -38,4 +38,4 @@
     max_runtime_mins=240, devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.chameleon_vga_weekly b/test_suites/control.chameleon_vga_weekly
index eaa6813..f50370a 100644
--- a/test_suites/control.chameleon_vga_weekly
+++ b/test_suites/control.chameleon_vga_weekly
@@ -38,4 +38,4 @@
     max_runtime_mins=240, devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.dummy b/test_suites/control.dummy
index d627123..8e12bc8 100644
--- a/test_suites/control.dummy
+++ b/test_suites/control.dummy
@@ -27,4 +27,4 @@
     file_bugs=file_bugs, priority=priority, timeout_mins=timeout_mins,
     devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
\ No newline at end of file
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
\ No newline at end of file
diff --git a/test_suites/control.dummy_server b/test_suites/control.dummy_server
index b4b6d88..e25df4a 100644
--- a/test_suites/control.dummy_server
+++ b/test_suites/control.dummy_server
@@ -27,4 +27,4 @@
     file_bugs=file_bugs, priority=priority, timeout_mins=timeout_mins,
     devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
\ No newline at end of file
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
\ No newline at end of file
diff --git a/test_suites/control.dummyflake b/test_suites/control.dummyflake
index 2ebe5fb..6bc12e4 100644
--- a/test_suites/control.dummyflake
+++ b/test_suites/control.dummyflake
@@ -34,4 +34,4 @@
     file_bugs=file_bugs, priority=priority, timeout_mins=timeout_mins,
     devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
\ No newline at end of file
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
\ No newline at end of file
diff --git a/test_suites/control.enterprise b/test_suites/control.enterprise
index d628d35..aabe3b6 100644
--- a/test_suites/control.enterprise
+++ b/test_suites/control.enterprise
@@ -34,4 +34,4 @@
     file_bugs=file_bugs, priority=priority, timeout_mins=timeout_mins,
     devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
\ No newline at end of file
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
\ No newline at end of file
diff --git a/test_suites/control.enterprise_enroll b/test_suites/control.enterprise_enroll
index bbfb1a0..33727ad 100644
--- a/test_suites/control.enterprise_enroll
+++ b/test_suites/control.enterprise_enroll
@@ -31,4 +31,4 @@
     file_bugs=file_bugs, priority=priority, timeout_mins=timeout_mins,
     devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
\ No newline at end of file
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
\ No newline at end of file
diff --git a/test_suites/control.experimental b/test_suites/control.experimental
index 51f2686..8f2165d 100644
--- a/test_suites/control.experimental
+++ b/test_suites/control.experimental
@@ -39,4 +39,4 @@
     timeout_mins=timeout_mins,
     devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.faft_bios b/test_suites/control.faft_bios
index 431f84f..e247d85 100644
--- a/test_suites/control.faft_bios
+++ b/test_suites/control.faft_bios
@@ -54,4 +54,4 @@
     bug_template=_BUG_TEMPLATE, devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
\ No newline at end of file
diff --git a/test_suites/control.faft_dev b/test_suites/control.faft_dev
index 75abf72..23c0bbc 100644
--- a/test_suites/control.faft_dev
+++ b/test_suites/control.faft_dev
@@ -41,4 +41,4 @@
     file_bugs=file_bugs, priority=priority, timeout_mins=timeout_mins,
     devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.faft_ec b/test_suites/control.faft_ec
index 37f31d0..86996d7 100644
--- a/test_suites/control.faft_ec
+++ b/test_suites/control.faft_ec
@@ -53,4 +53,4 @@
     bug_template=_BUG_TEMPLATE, devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.faft_lab b/test_suites/control.faft_lab
index b7a0417..ed6e9e7 100644
--- a/test_suites/control.faft_lab
+++ b/test_suites/control.faft_lab
@@ -46,4 +46,4 @@
     bug_template=_BUG_TEMPLATE, devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.faft_lv1 b/test_suites/control.faft_lv1
index 811ea4b..9285bc4 100644
--- a/test_suites/control.faft_lv1
+++ b/test_suites/control.faft_lv1
@@ -58,4 +58,4 @@
     bug_template=_BUG_TEMPLATE, devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.faft_lv2 b/test_suites/control.faft_lv2
index a8b0459..9977423 100644
--- a/test_suites/control.faft_lv2
+++ b/test_suites/control.faft_lv2
@@ -58,4 +58,4 @@
     bug_template=_BUG_TEMPLATE, devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.faft_lv3 b/test_suites/control.faft_lv3
index edcf23e..7d04157 100644
--- a/test_suites/control.faft_lv3
+++ b/test_suites/control.faft_lv3
@@ -58,4 +58,4 @@
     bug_template=_BUG_TEMPLATE, devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.faft_lv4 b/test_suites/control.faft_lv4
index f46bd82..aee8fbc 100644
--- a/test_suites/control.faft_lv4
+++ b/test_suites/control.faft_lv4
@@ -58,4 +58,4 @@
     bug_template=_BUG_TEMPLATE, devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.faft_normal b/test_suites/control.faft_normal
index a54d0d7..76300fd 100644
--- a/test_suites/control.faft_normal
+++ b/test_suites/control.faft_normal
@@ -55,4 +55,4 @@
     bug_template=_BUG_TEMPLATE, devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.gpu_hang b/test_suites/control.gpu_hang
index c59df07..a07bfbc 100644
--- a/test_suites/control.gpu_hang
+++ b/test_suites/control.gpu_hang
@@ -38,4 +38,4 @@
     max_runtime_mins=60, devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.graphics b/test_suites/control.graphics
index 7d25fef..1c0351d 100644
--- a/test_suites/control.graphics
+++ b/test_suites/control.graphics
@@ -47,4 +47,4 @@
     max_runtime_mins=240, devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.graphics_browser b/test_suites/control.graphics_browser
index 315f6bb..0705571 100644
--- a/test_suites/control.graphics_browser
+++ b/test_suites/control.graphics_browser
@@ -37,4 +37,4 @@
     max_runtime_mins=240, devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.graphics_per-build b/test_suites/control.graphics_per-build
index 3328ad6..59c9f82 100644
--- a/test_suites/control.graphics_per-build
+++ b/test_suites/control.graphics_per-build
@@ -38,4 +38,4 @@
     max_runtime_mins=60, devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.graphics_per-day b/test_suites/control.graphics_per-day
index 78f3331..95babe5 100644
--- a/test_suites/control.graphics_per-day
+++ b/test_suites/control.graphics_per-day
@@ -37,4 +37,4 @@
     max_runtime_mins=240, devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.graphics_per-week b/test_suites/control.graphics_per-week
index 1c0e5db..96a262a 100644
--- a/test_suites/control.graphics_per-week
+++ b/test_suites/control.graphics_per-week
@@ -37,4 +37,4 @@
     max_runtime_mins=240, devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.graphics_system b/test_suites/control.graphics_system
index de099af..b2975a3 100644
--- a/test_suites/control.graphics_system
+++ b/test_suites/control.graphics_system
@@ -38,4 +38,4 @@
     max_runtime_mins=240, devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.hardware_memoryqual b/test_suites/control.hardware_memoryqual
index 6619b5c..7e45fd7 100644
--- a/test_suites/control.hardware_memoryqual
+++ b/test_suites/control.hardware_memoryqual
@@ -34,4 +34,4 @@
     max_runtime_mins=max_runtime_mins,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.hardware_memoryqual_quick b/test_suites/control.hardware_memoryqual_quick
index 75dd29c..0f1043d 100644
--- a/test_suites/control.hardware_memoryqual_quick
+++ b/test_suites/control.hardware_memoryqual_quick
@@ -35,4 +35,4 @@
     max_runtime_mins=max_runtime_mins,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
\ No newline at end of file
diff --git a/test_suites/control.hardware_storagequal b/test_suites/control.hardware_storagequal
index 21217ac..04ddf7a 100644
--- a/test_suites/control.hardware_storagequal
+++ b/test_suites/control.hardware_storagequal
@@ -36,4 +36,4 @@
     max_runtime_mins=max_runtime_mins,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.hardware_storagequal_quick b/test_suites/control.hardware_storagequal_quick
index 28496fa..8aee583 100644
--- a/test_suites/control.hardware_storagequal_quick
+++ b/test_suites/control.hardware_storagequal_quick
@@ -35,4 +35,4 @@
     max_runtime_mins=max_runtime_mins,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.hardware_storagequal_temp b/test_suites/control.hardware_storagequal_temp
index 213f30d..b2fe5bf 100644
--- a/test_suites/control.hardware_storagequal_temp
+++ b/test_suites/control.hardware_storagequal_temp
@@ -36,4 +36,4 @@
     max_runtime_mins=max_runtime_mins,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.hotrod b/test_suites/control.hotrod
index 4fa6d94..b06daa9 100644
--- a/test_suites/control.hotrod
+++ b/test_suites/control.hotrod
@@ -40,4 +40,4 @@
     bug_template=_BUG_TEMPLATE, devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.hwqual b/test_suites/control.hwqual
index d9a601a..6a7355d 100644
--- a/test_suites/control.hwqual
+++ b/test_suites/control.hwqual
@@ -31,4 +31,4 @@
     file_bugs=file_bugs, priority=priority, timeout_mins=timeout_mins,
     devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
\ No newline at end of file
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
\ No newline at end of file
diff --git a/test_suites/control.jailed_build b/test_suites/control.jailed_build
index d272403..7d019c5 100644
--- a/test_suites/control.jailed_build
+++ b/test_suites/control.jailed_build
@@ -39,4 +39,4 @@
     timeout_mins=timeout_mins,
     devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.jailed_daily b/test_suites/control.jailed_daily
index 21eea3a..63f750d 100644
--- a/test_suites/control.jailed_daily
+++ b/test_suites/control.jailed_daily
@@ -39,4 +39,4 @@
     timeout_mins=timeout_mins,
     devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
\ No newline at end of file
diff --git a/test_suites/control.jailed_weekly b/test_suites/control.jailed_weekly
index 8d77a76..7c95f40 100644
--- a/test_suites/control.jailed_weekly
+++ b/test_suites/control.jailed_weekly
@@ -39,4 +39,4 @@
     timeout_mins=timeout_mins,
     devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.kernel_daily_benchmarks b/test_suites/control.kernel_daily_benchmarks
index c3166c2..8017a8c 100644
--- a/test_suites/control.kernel_daily_benchmarks
+++ b/test_suites/control.kernel_daily_benchmarks
@@ -44,4 +44,4 @@
     devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
     bug_template=_BUG_TEMPLATE, wait_for_results=wait_for_results,
     job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
\ No newline at end of file
diff --git a/test_suites/control.kernel_daily_regression b/test_suites/control.kernel_daily_regression
index be79abc..14a1c38 100644
--- a/test_suites/control.kernel_daily_regression
+++ b/test_suites/control.kernel_daily_regression
@@ -35,4 +35,4 @@
     file_bugs=file_bugs, priority=priority, timeout_mins=timeout_mins,
     devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
\ No newline at end of file
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
\ No newline at end of file
diff --git a/test_suites/control.kernel_per-build_benchmarks b/test_suites/control.kernel_per-build_benchmarks
index e6d8018..3c6f0ab 100644
--- a/test_suites/control.kernel_per-build_benchmarks
+++ b/test_suites/control.kernel_per-build_benchmarks
@@ -38,4 +38,4 @@
     file_bugs=file_bugs, priority=priority, timeout_mins=timeout_mins,
     devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
\ No newline at end of file
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
\ No newline at end of file
diff --git a/test_suites/control.kernel_per-build_regression b/test_suites/control.kernel_per-build_regression
index 43a88b6..b723ecb 100644
--- a/test_suites/control.kernel_per-build_regression
+++ b/test_suites/control.kernel_per-build_regression
@@ -40,4 +40,4 @@
     file_bugs=file_bugs, priority=priority, timeout_mins=timeout_mins,
     devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
\ No newline at end of file
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
\ No newline at end of file
diff --git a/test_suites/control.kernel_weekly_regression b/test_suites/control.kernel_weekly_regression
index d69ba51..4b43792 100644
--- a/test_suites/control.kernel_weekly_regression
+++ b/test_suites/control.kernel_weekly_regression
@@ -36,4 +36,4 @@
     file_bugs=file_bugs, priority=priority, timeout_mins=timeout_mins,
     devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
\ No newline at end of file
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
\ No newline at end of file
diff --git a/test_suites/control.link_perf b/test_suites/control.link_perf
index c4096e5..9a0f6bb 100644
--- a/test_suites/control.link_perf
+++ b/test_suites/control.link_perf
@@ -23,4 +23,4 @@
     devserver_url=devserver_url, timeout_mins=timeout_mins,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
\ No newline at end of file
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
\ No newline at end of file
diff --git a/test_suites/control.moblab b/test_suites/control.moblab
index 89ede33..921ea39 100644
--- a/test_suites/control.moblab
+++ b/test_suites/control.moblab
@@ -35,4 +35,4 @@
     devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.moblab_quick b/test_suites/control.moblab_quick
index 3cd4a99..c8e6127 100644
--- a/test_suites/control.moblab_quick
+++ b/test_suites/control.moblab_quick
@@ -35,4 +35,4 @@
     devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.network3g b/test_suites/control.network3g
index e0dbf42..4cd9544 100644
--- a/test_suites/control.network3g
+++ b/test_suites/control.network3g
@@ -48,4 +48,4 @@
     bug_template=_BUG_TEMPLATE, devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.network3g_att b/test_suites/control.network3g_att
index 0913947..e9d2aef 100644
--- a/test_suites/control.network3g_att
+++ b/test_suites/control.network3g_att
@@ -46,4 +46,4 @@
     suite_dependencies='carrier:att,modem_repair', timeout_mins=timeout_mins,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.network3g_gobi b/test_suites/control.network3g_gobi
index 84efaba..0200cb2 100644
--- a/test_suites/control.network3g_gobi
+++ b/test_suites/control.network3g_gobi
@@ -48,4 +48,4 @@
     devserver_url=devserver_url, suite_dependencies='modem_repair',
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.network3g_pseudomodem b/test_suites/control.network3g_pseudomodem
index 9441fda..d52df02 100644
--- a/test_suites/control.network3g_pseudomodem
+++ b/test_suites/control.network3g_pseudomodem
@@ -50,4 +50,4 @@
     timeout_mins=timeout_mins, bug_template=_BUG_TEMPLATE,
     devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.network3g_tmobile b/test_suites/control.network3g_tmobile
index 65aedac..9ca7409 100644
--- a/test_suites/control.network3g_tmobile
+++ b/test_suites/control.network3g_tmobile
@@ -49,4 +49,4 @@
     timeout_mins=timeout_mins,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.network3g_verizon b/test_suites/control.network3g_verizon
index 8e0668c..9d281a8 100644
--- a/test_suites/control.network3g_verizon
+++ b/test_suites/control.network3g_verizon
@@ -49,4 +49,4 @@
     timeout_mins=timeout_mins,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.network_ui b/test_suites/control.network_ui
index e3e8dbb..e15685e 100644
--- a/test_suites/control.network_ui
+++ b/test_suites/control.network_ui
@@ -50,4 +50,4 @@
     bug_template=_BUG_TEMPLATE, devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.network_wifi b/test_suites/control.network_wifi
index aa75037..7c99881 100644
--- a/test_suites/control.network_wifi
+++ b/test_suites/control.network_wifi
@@ -36,4 +36,4 @@
     file_bugs=file_bugs, priority=priority, timeout_mins=timeout_mins,
     devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
\ No newline at end of file
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
\ No newline at end of file
diff --git a/test_suites/control.onccell b/test_suites/control.onccell
index 71cd03b..d6c4324 100644
--- a/test_suites/control.onccell
+++ b/test_suites/control.onccell
@@ -31,4 +31,4 @@
     file_bugs=file_bugs, priority=priority, timeout_mins=timeout_mins,
     devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
\ No newline at end of file
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
\ No newline at end of file
diff --git a/test_suites/control.pagecycler b/test_suites/control.pagecycler
index 1dfad67..774226a 100644
--- a/test_suites/control.pagecycler
+++ b/test_suites/control.pagecycler
@@ -34,4 +34,4 @@
     file_bugs=file_bugs, priority=priority, timeout_mins=timeout_mins,
     devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
\ No newline at end of file
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
\ No newline at end of file
diff --git a/test_suites/control.paygen_au_beta b/test_suites/control.paygen_au_beta
index f4c75fd..bfabe9e 100644
--- a/test_suites/control.paygen_au_beta
+++ b/test_suites/control.paygen_au_beta
@@ -64,4 +64,4 @@
     devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.paygen_au_canary b/test_suites/control.paygen_au_canary
index 221dede..c7550b1 100644
--- a/test_suites/control.paygen_au_canary
+++ b/test_suites/control.paygen_au_canary
@@ -64,4 +64,4 @@
     devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.paygen_au_dev b/test_suites/control.paygen_au_dev
index a100af4..8031c38 100644
--- a/test_suites/control.paygen_au_dev
+++ b/test_suites/control.paygen_au_dev
@@ -64,4 +64,4 @@
     devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.paygen_au_stable b/test_suites/control.paygen_au_stable
index 1347911..f581c62 100644
--- a/test_suites/control.paygen_au_stable
+++ b/test_suites/control.paygen_au_stable
@@ -64,4 +64,4 @@
     devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.perf_v2 b/test_suites/control.perf_v2
index 33f8f14..d9bd74c 100644
--- a/test_suites/control.perf_v2
+++ b/test_suites/control.perf_v2
@@ -49,4 +49,4 @@
     bug_template=_BUG_TEMPLATE, devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.perfalerts b/test_suites/control.perfalerts
index 1cdcde7..9a9454a 100644
--- a/test_suites/control.perfalerts
+++ b/test_suites/control.perfalerts
@@ -36,4 +36,4 @@
     file_bugs=file_bugs, priority=priority, timeout_mins=timeout_mins,
     devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
\ No newline at end of file
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
\ No newline at end of file
diff --git a/test_suites/control.performance b/test_suites/control.performance
index f25b0a0..61d3404 100644
--- a/test_suites/control.performance
+++ b/test_suites/control.performance
@@ -45,4 +45,4 @@
     bug_template=_BUG_TEMPLATE, devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.performance_optional b/test_suites/control.performance_optional
index db07081..1c5df69 100644
--- a/test_suites/control.performance_optional
+++ b/test_suites/control.performance_optional
@@ -45,4 +45,4 @@
     bug_template=_BUG_TEMPLATE, devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
\ No newline at end of file
diff --git a/test_suites/control.power_build b/test_suites/control.power_build
index 1d2f94c..d1bf1e0 100644
--- a/test_suites/control.power_build
+++ b/test_suites/control.power_build
@@ -31,4 +31,4 @@
     file_bugs=file_bugs, priority=priority, timeout_mins=timeout_mins,
     devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
\ No newline at end of file
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
\ No newline at end of file
diff --git a/test_suites/control.power_daily b/test_suites/control.power_daily
index 702a3a1..cac85c7 100644
--- a/test_suites/control.power_daily
+++ b/test_suites/control.power_daily
@@ -41,4 +41,4 @@
     bug_template=_BUG_TEMPLATE, devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.power_requirements b/test_suites/control.power_requirements
index 623f0e1..6ae9bcb 100644
--- a/test_suites/control.power_requirements
+++ b/test_suites/control.power_requirements
@@ -32,4 +32,4 @@
     file_bugs=file_bugs, priority=priority, timeout_mins=timeout_mins,
     devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
\ No newline at end of file
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
\ No newline at end of file
diff --git a/test_suites/control.push_to_prod b/test_suites/control.push_to_prod
index a83dfa7..a121973 100644
--- a/test_suites/control.push_to_prod
+++ b/test_suites/control.push_to_prod
@@ -61,4 +61,4 @@
     max_runtime_mins=20, bug_template=_BUG_TEMPLATE,
     devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
\ No newline at end of file
diff --git a/test_suites/control.pyauto b/test_suites/control.pyauto
index 4b7479a..d102c8a 100644
--- a/test_suites/control.pyauto
+++ b/test_suites/control.pyauto
@@ -34,4 +34,4 @@
     file_bugs=file_bugs, priority=priority, timeout_mins=timeout_mins,
     devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
\ No newline at end of file
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
\ No newline at end of file
diff --git a/test_suites/control.pyauto_basic b/test_suites/control.pyauto_basic
index 14a7e24..084946d 100644
--- a/test_suites/control.pyauto_basic
+++ b/test_suites/control.pyauto_basic
@@ -34,4 +34,4 @@
     file_bugs=file_bugs, priority=priority, timeout_mins=timeout_mins,
     devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
\ No newline at end of file
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
\ No newline at end of file
diff --git a/test_suites/control.pyauto_perf b/test_suites/control.pyauto_perf
index b63aca8..e1013cd 100644
--- a/test_suites/control.pyauto_perf
+++ b/test_suites/control.pyauto_perf
@@ -35,4 +35,4 @@
     max_runtime_mins=360, devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.regression b/test_suites/control.regression
index 12cfd26..bcbaace 100644
--- a/test_suites/control.regression
+++ b/test_suites/control.regression
@@ -36,4 +36,4 @@
     max_runtime_mins=120, devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.sanity b/test_suites/control.sanity
index e9b9dc8..ea04b43 100644
--- a/test_suites/control.sanity
+++ b/test_suites/control.sanity
@@ -32,4 +32,4 @@
     file_bugs=file_bugs, priority=priority, timeout_mins=timeout_mins,
     devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.security b/test_suites/control.security
index dd69a31..9810b48 100644
--- a/test_suites/control.security
+++ b/test_suites/control.security
@@ -37,4 +37,4 @@
     file_bugs=file_bugs, priority=priority, timeout_mins=timeout_mins,
     devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
\ No newline at end of file
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
\ No newline at end of file
diff --git a/test_suites/control.security_weekly b/test_suites/control.security_weekly
index 0e672b0..8369672 100644
--- a/test_suites/control.security_weekly
+++ b/test_suites/control.security_weekly
@@ -36,4 +36,4 @@
     file_bugs=file_bugs, priority=priority, timeout_mins=timeout_mins,
     devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
\ No newline at end of file
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
\ No newline at end of file
diff --git a/test_suites/control.servo b/test_suites/control.servo
index 83c631c..1fe7d8f 100644
--- a/test_suites/control.servo
+++ b/test_suites/control.servo
@@ -27,4 +27,4 @@
     devserver_url=devserver_url, timeout_mins=timeout_mins,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
\ No newline at end of file
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
\ No newline at end of file
diff --git a/test_suites/control.smoke b/test_suites/control.smoke
index 34844bb..bf4ac18 100644
--- a/test_suites/control.smoke
+++ b/test_suites/control.smoke
@@ -35,4 +35,4 @@
     file_bugs=file_bugs, priority=priority, timeout_mins=timeout_mins,
     devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
\ No newline at end of file
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
\ No newline at end of file
diff --git a/test_suites/control.storagequal b/test_suites/control.storagequal
index 8e54711..e38ef6a 100644
--- a/test_suites/control.storagequal
+++ b/test_suites/control.storagequal
@@ -35,4 +35,4 @@
     max_runtime_mins=max_runtime_mins,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.stress b/test_suites/control.stress
index ed6285b..b25cf53 100644
--- a/test_suites/control.stress
+++ b/test_suites/control.stress
@@ -45,4 +45,5 @@
     file_bugs=file_bugs, priority=priority, timeout_mins=timeout_mins,
     devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries, bug_template=_BUG_TEMPLATE)
+    max_retries=max_retries, bug_template=_BUG_TEMPLATE,
+    offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.stress2 b/test_suites/control.stress2
index 98c2220..d13d855 100644
--- a/test_suites/control.stress2
+++ b/test_suites/control.stress2
@@ -45,4 +45,5 @@
     file_bugs=file_bugs, priority=priority, timeout_mins=timeout_mins,
     devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries, bug_template=_BUG_TEMPLATE)
+    max_retries=max_retries, bug_template=_BUG_TEMPLATE,
+    offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.stress3 b/test_suites/control.stress3
index 7858afc..26fff7f 100644
--- a/test_suites/control.stress3
+++ b/test_suites/control.stress3
@@ -45,4 +45,5 @@
     file_bugs=file_bugs, priority=priority, timeout_mins=timeout_mins,
     devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries, bug_template=_BUG_TEMPLATE)
+    max_retries=max_retries, bug_template=_BUG_TEMPLATE,
+    offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.stress4 b/test_suites/control.stress4
index e231e2c..97b252a 100644
--- a/test_suites/control.stress4
+++ b/test_suites/control.stress4
@@ -45,4 +45,5 @@
     file_bugs=file_bugs, priority=priority, timeout_mins=timeout_mins,
     devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries, bug_template=_BUG_TEMPLATE)
+    max_retries=max_retries, bug_template=_BUG_TEMPLATE,
+    offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.stress5 b/test_suites/control.stress5
index b1b9fb7..14c1798 100644
--- a/test_suites/control.stress5
+++ b/test_suites/control.stress5
@@ -45,4 +45,5 @@
     file_bugs=file_bugs, priority=priority, timeout_mins=timeout_mins,
     devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries, bug_template=_BUG_TEMPLATE)
+    max_retries=max_retries, bug_template=_BUG_TEMPLATE,
+    offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.stress_experimental b/test_suites/control.stress_experimental
index 6dbe7e1..d579f54 100644
--- a/test_suites/control.stress_experimental
+++ b/test_suites/control.stress_experimental
@@ -43,4 +43,5 @@
     file_bugs=file_bugs, priority=priority, timeout_mins=timeout_mins,
     devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries, bug_template=_BUG_TEMPLATE)
+    max_retries=max_retries, bug_template=_BUG_TEMPLATE,
+    offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.sync b/test_suites/control.sync
index 01d2fbc..d32e52f 100644
--- a/test_suites/control.sync
+++ b/test_suites/control.sync
@@ -34,4 +34,4 @@
     file_bugs=file_bugs, priority=priority, timeout_mins=timeout_mins,
     devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
\ No newline at end of file
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
\ No newline at end of file
diff --git a/test_suites/control.telemetry_unit b/test_suites/control.telemetry_unit
index ff9a3e0..6e5de79 100644
--- a/test_suites/control.telemetry_unit
+++ b/test_suites/control.telemetry_unit
@@ -34,4 +34,4 @@
     file_bugs=file_bugs, priority=priority, timeout_mins=timeout_mins,
     devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
\ No newline at end of file
+	max_retries=max_retries, offload_failures_only=offload_failures_only)
\ No newline at end of file
diff --git a/test_suites/control.tendo_experimental b/test_suites/control.tendo_experimental
index fa8868e..6d8239d 100644
--- a/test_suites/control.tendo_experimental
+++ b/test_suites/control.tendo_experimental
@@ -38,5 +38,5 @@
     timeout_mins=timeout_mins,
     devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
 
diff --git a/test_suites/control.test_that_wrapper b/test_suites/control.test_that_wrapper
index d430cde..beaf977 100644
--- a/test_suites/control.test_that_wrapper
+++ b/test_suites/control.test_that_wrapper
@@ -69,4 +69,5 @@
     max_runtime_mins=20, bug_template=_BUG_TEMPLATE,
     devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
     predicate=combined_predicate, wait_for_results=wait_for_results,
-    job_retry=job_retry, max_retries=max_retries)
+    job_retry=job_retry, max_retries=max_retries,
+    offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.ui b/test_suites/control.ui
index a216cad..133dbba 100644
--- a/test_suites/control.ui
+++ b/test_suites/control.ui
@@ -31,4 +31,4 @@
     file_bugs=file_bugs, priority=priority, timeout_mins=timeout_mins,
     devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.video b/test_suites/control.video
index 7320337..5e25a43 100644
--- a/test_suites/control.video
+++ b/test_suites/control.video
@@ -35,4 +35,4 @@
     max_runtime_mins=240, devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.video_weekly_regression b/test_suites/control.video_weekly_regression
index 1f4c520..825dba0 100644
--- a/test_suites/control.video_weekly_regression
+++ b/test_suites/control.video_weekly_regression
@@ -37,4 +37,4 @@
     max_runtime_mins=240, devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.webrtc b/test_suites/control.webrtc
index 15dd94b..c0e0995 100644
--- a/test_suites/control.webrtc
+++ b/test_suites/control.webrtc
@@ -46,4 +46,4 @@
     bug_template=_BUG_TEMPLATE, devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.webstore b/test_suites/control.webstore
index c8102c7..adf2f2a 100644
--- a/test_suites/control.webstore
+++ b/test_suites/control.webstore
@@ -49,4 +49,5 @@
     max_runtime_mins=20, bug_template=_BUG_TEMPLATE,
     devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries, skip_reimage=dynamic_suite.skip_reimage(globals()))
+    max_retries=max_retries, offload_failures_only=offload_failures_only,
+    skip_reimage=dynamic_suite.skip_reimage(globals()))
diff --git a/test_suites/control.wifi_atten_perf b/test_suites/control.wifi_atten_perf
index 3e18b84..f9da9b4 100644
--- a/test_suites/control.wifi_atten_perf
+++ b/test_suites/control.wifi_atten_perf
@@ -37,4 +37,4 @@
     max_runtime_mins=60 * 6, devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX, timeout_mins=timeout_mins,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
\ No newline at end of file
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
\ No newline at end of file
diff --git a/test_suites/control.wifi_correctness_cros_core b/test_suites/control.wifi_correctness_cros_core
index 3552223..3c5e27a 100644
--- a/test_suites/control.wifi_correctness_cros_core
+++ b/test_suites/control.wifi_correctness_cros_core
@@ -37,4 +37,4 @@
     max_runtime_mins=60, devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.wifi_flaky b/test_suites/control.wifi_flaky
index 7d52b18..729f7a7 100644
--- a/test_suites/control.wifi_flaky
+++ b/test_suites/control.wifi_flaky
@@ -29,4 +29,4 @@
     max_runtime_mins=60, devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.wifi_interop b/test_suites/control.wifi_interop
index 517df56..5b52b1b 100644
--- a/test_suites/control.wifi_interop
+++ b/test_suites/control.wifi_interop
@@ -37,4 +37,4 @@
     max_runtime_mins=60*6, devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.wifi_matfunc b/test_suites/control.wifi_matfunc
index 6043f7a..cec8087 100644
--- a/test_suites/control.wifi_matfunc
+++ b/test_suites/control.wifi_matfunc
@@ -37,4 +37,4 @@
     max_runtime_mins=60, devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.wifi_matfunc_bcm4356 b/test_suites/control.wifi_matfunc_bcm4356
index 186033b..3475f3b 100644
--- a/test_suites/control.wifi_matfunc_bcm4356
+++ b/test_suites/control.wifi_matfunc_bcm4356
@@ -37,4 +37,5 @@
     max_runtime_mins=60, devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX, job_retry=job_retry,
     max_retries=max_retries, suite_dependencies='wifi:bcm4356',
-    wait_for_results=wait_for_results)
+    wait_for_results=wait_for_results,
+    offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.wifi_matfunc_intel7265 b/test_suites/control.wifi_matfunc_intel7265
index 5f2834c..7c2635d 100644
--- a/test_suites/control.wifi_matfunc_intel7265
+++ b/test_suites/control.wifi_matfunc_intel7265
@@ -37,4 +37,5 @@
     max_runtime_mins=60, devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX, job_retry=job_retry,
     max_retries=max_retries, suite_dependencies='wifi:intel7265',
-    wait_for_results=wait_for_results)
+    wait_for_results=wait_for_results,
+    offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.wifi_matfunc_marvell8897 b/test_suites/control.wifi_matfunc_marvell8897
index 4be0325..bf24a3a 100644
--- a/test_suites/control.wifi_matfunc_marvell8897
+++ b/test_suites/control.wifi_matfunc_marvell8897
@@ -37,4 +37,5 @@
     max_runtime_mins=60, devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX, job_retry=job_retry,
     max_retries=max_retries, suite_dependencies='wifi:marvell8897',
-    wait_for_results=wait_for_results)
+    wait_for_results=wait_for_results,
+    offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.wifi_perf b/test_suites/control.wifi_perf
index 0cb5681..34551f4 100644
--- a/test_suites/control.wifi_perf
+++ b/test_suites/control.wifi_perf
@@ -35,4 +35,4 @@
     max_runtime_mins=60, devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.wifi_perf_bcm4356 b/test_suites/control.wifi_perf_bcm4356
index e2a0a98..16c784c 100644
--- a/test_suites/control.wifi_perf_bcm4356
+++ b/test_suites/control.wifi_perf_bcm4356
@@ -35,4 +35,5 @@
     max_runtime_mins=60, devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries, suite_dependencies='wifi:bcm4356')
+    max_retries=max_retries, suite_dependencies='wifi:bcm4356',
+    offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.wifi_perf_intel7265 b/test_suites/control.wifi_perf_intel7265
index 4f78075..b5c0bad 100644
--- a/test_suites/control.wifi_perf_intel7265
+++ b/test_suites/control.wifi_perf_intel7265
@@ -35,4 +35,5 @@
     max_runtime_mins=60, devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries, suite_dependencies='wifi:intel7265')
+    max_retries=max_retries, suite_dependencies='wifi:intel7265',
+    offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.wifi_perf_marvell8897 b/test_suites/control.wifi_perf_marvell8897
index 80af512..01bb4de 100644
--- a/test_suites/control.wifi_perf_marvell8897
+++ b/test_suites/control.wifi_perf_marvell8897
@@ -35,4 +35,5 @@
     max_runtime_mins=60, devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries, suite_dependencies='wifi:marvell8897')
+    max_retries=max_retries, suite_dependencies='wifi:marvell8897',
+    offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.wifi_release b/test_suites/control.wifi_release
index ffbd6e9..ca427e6 100644
--- a/test_suites/control.wifi_release
+++ b/test_suites/control.wifi_release
@@ -37,4 +37,4 @@
     max_runtime_mins=60, devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.wifichaos b/test_suites/control.wifichaos
index fe1ebe5..08fe5fb 100644
--- a/test_suites/control.wifichaos
+++ b/test_suites/control.wifichaos
@@ -31,4 +31,4 @@
     file_bugs=file_bugs, devserver_url=devserver_url, priority=priority,
     timeout_mins=timeout_mins, version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
\ No newline at end of file
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
\ No newline at end of file
diff --git a/test_suites/control.wifirvr b/test_suites/control.wifirvr
index 00c3596..7a7ff15 100644
--- a/test_suites/control.wifirvr
+++ b/test_suites/control.wifirvr
@@ -37,4 +37,4 @@
     devserver_url=devserver_url, timeout_mins=timeout_mins,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
\ No newline at end of file
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
\ No newline at end of file
diff --git a/test_suites/control.wimax b/test_suites/control.wimax
index 37ccac8..2b50c5e 100644
--- a/test_suites/control.wimax
+++ b/test_suites/control.wimax
@@ -55,4 +55,4 @@
     bug_template=_BUG_TEMPLATE, devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.youtube_mse_eme b/test_suites/control.youtube_mse_eme
index a4fc895..d8887ec 100644
--- a/test_suites/control.youtube_mse_eme
+++ b/test_suites/control.youtube_mse_eme
@@ -37,4 +37,4 @@
     max_runtime_mins=60, devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)
diff --git a/test_suites/control.youtube_page b/test_suites/control.youtube_page
index cceaba8..4909847 100644
--- a/test_suites/control.youtube_page
+++ b/test_suites/control.youtube_page
@@ -37,4 +37,4 @@
     max_runtime_mins=60, devserver_url=devserver_url,
     version_prefix=provision.CROS_VERSION_PREFIX,
     wait_for_results=wait_for_results, job_retry=job_retry,
-    max_retries=max_retries)
+    max_retries=max_retries, offload_failures_only=offload_failures_only)