Revert "faft: Don't disable sysinfo, as local_dash uses sysinfo to get fw versions"

This reverts commit d6da7bf306f6ca5a64d530828ba9a77cb21f4cf9

The original fix is not a good idea since it rapidly consume disk space. It can be fixed in local_dash. Check more info in the bug.

BUG=chromium-os:36326

Change-Id: I0a0e8ca403e4c619f1352bc070a1c05ccf058d02
Reviewed-on: https://gerrit.chromium.org/gerrit/38171
Reviewed-by: Vic Yang <victoryang@chromium.org>
Commit-Ready: Tom Wai-Hong Tam <waihong@chromium.org>
Tested-by: Tom Wai-Hong Tam <waihong@chromium.org>
diff --git a/server/site_tests/firmware_CgptState/control b/server/site_tests/firmware_CgptState/control
index bbf7498..65ae527 100644
--- a/server/site_tests/firmware_CgptState/control
+++ b/server/site_tests/firmware_CgptState/control
@@ -30,6 +30,7 @@
 def run_cgptstate(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_CgptState", host=host, cmdline_args=args,
-                 use_faft=True, dev_mode=False, tag="normal")
+                 use_faft=True, disable_sysinfo=True,
+                 dev_mode=False, tag="normal")
 
 parallel_simple(run_cgptstate, machines)
diff --git a/server/site_tests/firmware_CgptStress/control b/server/site_tests/firmware_CgptStress/control
index 64b0155..24ea2e6 100644
--- a/server/site_tests/firmware_CgptStress/control
+++ b/server/site_tests/firmware_CgptStress/control
@@ -26,6 +26,7 @@
 def run_cgptstress(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_CgptStress", host=host, cmdline_args=args,
-                 use_faft=True, dev_mode=False, tag="normal")
+                 use_faft=True, disable_sysinfo=True,
+                 dev_mode=False, tag="normal")
 
 parallel_simple(run_cgptstress, machines)
diff --git a/server/site_tests/firmware_CgptStress/control.dev b/server/site_tests/firmware_CgptStress/control.dev
index 10782e4..1487c95 100644
--- a/server/site_tests/firmware_CgptStress/control.dev
+++ b/server/site_tests/firmware_CgptStress/control.dev
@@ -26,6 +26,7 @@
 def run_cgptstress(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_CgptStress", host=host, cmdline_args=args,
-                 use_faft=True, dev_mode=True, tag="dev")
+                 use_faft=True, disable_sysinfo=True,
+                 dev_mode=True, tag="dev")
 
 parallel_simple(run_cgptstress, machines)
diff --git a/server/site_tests/firmware_ConsecutiveBoot/control b/server/site_tests/firmware_ConsecutiveBoot/control
index 67d4208..b9bdd06 100644
--- a/server/site_tests/firmware_ConsecutiveBoot/control
+++ b/server/site_tests/firmware_ConsecutiveBoot/control
@@ -28,6 +28,7 @@
 def run_consecutive_boot(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_ConsecutiveBoot", host=host, cmdline_args=args,
-                 use_faft=True, dev_mode=False, tag="normal")
+                 use_faft=True, disable_sysinfo=True,
+                 dev_mode=False, tag="normal")
 
 parallel_simple(run_consecutive_boot, machines)
diff --git a/server/site_tests/firmware_ConsecutiveBoot/control.dev b/server/site_tests/firmware_ConsecutiveBoot/control.dev
index f817188..8888204 100644
--- a/server/site_tests/firmware_ConsecutiveBoot/control.dev
+++ b/server/site_tests/firmware_ConsecutiveBoot/control.dev
@@ -28,6 +28,7 @@
 def run_consecutive_boot(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_ConsecutiveBoot", host=host, cmdline_args=args,
-                 use_faft=True, dev_mode=True, tag="dev")
+                 use_faft=True, disable_sysinfo=True,
+                 dev_mode=True, tag="dev")
 
 parallel_simple(run_consecutive_boot, machines)
diff --git a/server/site_tests/firmware_CorruptBothFwBodyAB/control b/server/site_tests/firmware_CorruptBothFwBodyAB/control
index 5d65bd8..df2568a 100644
--- a/server/site_tests/firmware_CorruptBothFwBodyAB/control
+++ b/server/site_tests/firmware_CorruptBothFwBodyAB/control
@@ -32,6 +32,7 @@
 def run_corruptbothfwbodyab(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_CorruptBothFwBodyAB", host=host, cmdline_args=args,
-                 use_faft=True, dev_mode=False, tag="normal")
+                 use_faft=True, disable_sysinfo=True,
+                 dev_mode=False, tag="normal")
 
 parallel_simple(run_corruptbothfwbodyab, machines)
diff --git a/server/site_tests/firmware_CorruptBothFwBodyAB/control.dev b/server/site_tests/firmware_CorruptBothFwBodyAB/control.dev
index 2e108ff..39fdc60 100644
--- a/server/site_tests/firmware_CorruptBothFwBodyAB/control.dev
+++ b/server/site_tests/firmware_CorruptBothFwBodyAB/control.dev
@@ -32,6 +32,7 @@
 def run_corruptbothfwbodyab(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_CorruptBothFwBodyAB", host=host, cmdline_args=args,
-                 use_faft=True, dev_mode=True, tag="dev")
+                 use_faft=True, disable_sysinfo=True,
+                 dev_mode=True, tag="dev")
 
 parallel_simple(run_corruptbothfwbodyab, machines)
diff --git a/server/site_tests/firmware_CorruptBothFwSigAB/control b/server/site_tests/firmware_CorruptBothFwSigAB/control
index 76db663..faf52df 100644
--- a/server/site_tests/firmware_CorruptBothFwSigAB/control
+++ b/server/site_tests/firmware_CorruptBothFwSigAB/control
@@ -28,6 +28,7 @@
 def run_corruptbothfwsigab(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_CorruptBothFwSigAB", host=host, cmdline_args=args,
-                 use_faft=True, dev_mode=False, tag="normal")
+                 use_faft=True, disable_sysinfo=True,
+                 dev_mode=False, tag="normal")
 
 parallel_simple(run_corruptbothfwsigab, machines)
diff --git a/server/site_tests/firmware_CorruptBothFwSigAB/control.dev b/server/site_tests/firmware_CorruptBothFwSigAB/control.dev
index 18d0060..3788dc2 100644
--- a/server/site_tests/firmware_CorruptBothFwSigAB/control.dev
+++ b/server/site_tests/firmware_CorruptBothFwSigAB/control.dev
@@ -28,6 +28,7 @@
 def run_corruptbothfwsigab(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_CorruptBothFwSigAB", host=host, cmdline_args=args,
-                 use_faft=True, dev_mode=True, tag="dev")
+                 use_faft=True, disable_sysinfo=True,
+                 dev_mode=True, tag="dev")
 
 parallel_simple(run_corruptbothfwsigab, machines)
diff --git a/server/site_tests/firmware_CorruptBothKernelAB/control b/server/site_tests/firmware_CorruptBothKernelAB/control
index 9e766c3..c2d05fb 100644
--- a/server/site_tests/firmware_CorruptBothKernelAB/control
+++ b/server/site_tests/firmware_CorruptBothKernelAB/control
@@ -30,6 +30,7 @@
 def run_corruptbothkernelab(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_CorruptBothKernelAB", host=host, cmdline_args=args,
-                 use_faft=True, dev_mode=False, tag="normal")
+                 use_faft=True, disable_sysinfo=True,
+                 dev_mode=False, tag="normal")
 
 parallel_simple(run_corruptbothkernelab, machines)
diff --git a/server/site_tests/firmware_CorruptBothKernelAB/control.dev b/server/site_tests/firmware_CorruptBothKernelAB/control.dev
index 645567a..caee907 100644
--- a/server/site_tests/firmware_CorruptBothKernelAB/control.dev
+++ b/server/site_tests/firmware_CorruptBothKernelAB/control.dev
@@ -30,6 +30,7 @@
 def run_corruptbothkernelab(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_CorruptBothKernelAB", host=host, cmdline_args=args,
-                 use_faft=True, dev_mode=True, tag="dev")
+                 use_faft=True, disable_sysinfo=True,
+                 dev_mode=True, tag="dev")
 
 parallel_simple(run_corruptbothkernelab, machines)
diff --git a/server/site_tests/firmware_CorruptFwBodyA/control b/server/site_tests/firmware_CorruptFwBodyA/control
index 23b4c22..82b27cb 100644
--- a/server/site_tests/firmware_CorruptFwBodyA/control
+++ b/server/site_tests/firmware_CorruptFwBodyA/control
@@ -30,6 +30,7 @@
 def run_corruptfwbodya(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_CorruptFwBodyA", host=host, cmdline_args=args,
-                 use_faft=True, dev_mode=False, tag="normal")
+                 use_faft=True, disable_sysinfo=True,
+                 dev_mode=False, tag="normal")
 
 parallel_simple(run_corruptfwbodya, machines)
diff --git a/server/site_tests/firmware_CorruptFwBodyA/control.dev b/server/site_tests/firmware_CorruptFwBodyA/control.dev
index 7b79dc3..d06f92f 100644
--- a/server/site_tests/firmware_CorruptFwBodyA/control.dev
+++ b/server/site_tests/firmware_CorruptFwBodyA/control.dev
@@ -30,6 +30,7 @@
 def run_corruptfwbodya(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_CorruptFwBodyA", host=host, cmdline_args=args,
-                 use_faft=True, dev_mode=True, tag="dev")
+                 use_faft=True, disable_sysinfo=True,
+                 dev_mode=True, tag="dev")
 
 parallel_simple(run_corruptfwbodya, machines)
diff --git a/server/site_tests/firmware_CorruptFwBodyB/control b/server/site_tests/firmware_CorruptFwBodyB/control
index e78a601..50d368b 100644
--- a/server/site_tests/firmware_CorruptFwBodyB/control
+++ b/server/site_tests/firmware_CorruptFwBodyB/control
@@ -30,6 +30,7 @@
 def run_corruptfwbodyb(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_CorruptFwBodyB", host=host, cmdline_args=args,
-                 use_faft=True, dev_mode=False, tag="normal")
+                 use_faft=True, disable_sysinfo=True,
+                 dev_mode=False, tag="normal")
 
 parallel_simple(run_corruptfwbodyb, machines)
diff --git a/server/site_tests/firmware_CorruptFwBodyB/control.dev b/server/site_tests/firmware_CorruptFwBodyB/control.dev
index 3cce91f..b63b5f7 100644
--- a/server/site_tests/firmware_CorruptFwBodyB/control.dev
+++ b/server/site_tests/firmware_CorruptFwBodyB/control.dev
@@ -30,6 +30,7 @@
 def run_corruptfwbodyb(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_CorruptFwBodyB", host=host, cmdline_args=args,
-                 use_faft=True, dev_mode=True, tag="dev")
+                 use_faft=True, disable_sysinfo=True,
+                 dev_mode=True, tag="dev")
 
 parallel_simple(run_corruptfwbodyb, machines)
diff --git a/server/site_tests/firmware_CorruptFwSigA/control b/server/site_tests/firmware_CorruptFwSigA/control
index e9494f7..8bc8120 100644
--- a/server/site_tests/firmware_CorruptFwSigA/control
+++ b/server/site_tests/firmware_CorruptFwSigA/control
@@ -24,6 +24,7 @@
 def run_corruptfwsiga(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_CorruptFwSigA", host=host, cmdline_args=args,
-                 use_faft=True, dev_mode=False, tag="normal")
+                 use_faft=True, disable_sysinfo=True,
+                 dev_mode=False, tag="normal")
 
 parallel_simple(run_corruptfwsiga, machines)
diff --git a/server/site_tests/firmware_CorruptFwSigA/control.dev b/server/site_tests/firmware_CorruptFwSigA/control.dev
index fbafdd5..23be2cd 100644
--- a/server/site_tests/firmware_CorruptFwSigA/control.dev
+++ b/server/site_tests/firmware_CorruptFwSigA/control.dev
@@ -24,6 +24,7 @@
 def run_corruptfwsiga(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_CorruptFwSigA", host=host, cmdline_args=args,
-                 use_faft=True, dev_mode=True, tag="dev")
+                 use_faft=True, disable_sysinfo=True,
+                 dev_mode=True, tag="dev")
 
 parallel_simple(run_corruptfwsiga, machines)
diff --git a/server/site_tests/firmware_CorruptFwSigB/control b/server/site_tests/firmware_CorruptFwSigB/control
index ea7d02d..4f178f5 100644
--- a/server/site_tests/firmware_CorruptFwSigB/control
+++ b/server/site_tests/firmware_CorruptFwSigB/control
@@ -24,6 +24,7 @@
 def run_corruptfwsigb(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_CorruptFwSigB", host=host, cmdline_args=args,
-                 use_faft=True, dev_mode=False, tag="normal")
+                 use_faft=True, disable_sysinfo=True,
+                 dev_mode=False, tag="normal")
 
 parallel_simple(run_corruptfwsigb, machines)
diff --git a/server/site_tests/firmware_CorruptFwSigB/control.dev b/server/site_tests/firmware_CorruptFwSigB/control.dev
index a5be2ff..07b7713 100644
--- a/server/site_tests/firmware_CorruptFwSigB/control.dev
+++ b/server/site_tests/firmware_CorruptFwSigB/control.dev
@@ -24,6 +24,7 @@
 def run_corruptfwsigb(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_CorruptFwSigB", host=host, cmdline_args=args,
-                 use_faft=True, dev_mode=True, tag="dev")
+                 use_faft=True, disable_sysinfo=True,
+                 dev_mode=True, tag="dev")
 
 parallel_simple(run_corruptfwsigb, machines)
diff --git a/server/site_tests/firmware_CorruptKernelA/control b/server/site_tests/firmware_CorruptKernelA/control
index 2ba9136..fdac5ac 100644
--- a/server/site_tests/firmware_CorruptKernelA/control
+++ b/server/site_tests/firmware_CorruptKernelA/control
@@ -25,6 +25,7 @@
 def run_corruptkernela(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_CorruptKernelA", host=host, cmdline_args=args,
-                 use_faft=True, dev_mode=False, tag="normal")
+                 use_faft=True, disable_sysinfo=True,
+                 dev_mode=False, tag="normal")
 
 parallel_simple(run_corruptkernela, machines)
diff --git a/server/site_tests/firmware_CorruptKernelA/control.dev b/server/site_tests/firmware_CorruptKernelA/control.dev
index 555b356..c5f7b48 100644
--- a/server/site_tests/firmware_CorruptKernelA/control.dev
+++ b/server/site_tests/firmware_CorruptKernelA/control.dev
@@ -25,6 +25,7 @@
 def run_corruptkernela(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_CorruptKernelA", host=host, cmdline_args=args,
-                 use_faft=True, dev_mode=True, tag="dev")
+                 use_faft=True, disable_sysinfo=True,
+                 dev_mode=True, tag="dev")
 
 parallel_simple(run_corruptkernela, machines)
diff --git a/server/site_tests/firmware_CorruptKernelB/control b/server/site_tests/firmware_CorruptKernelB/control
index cb03c37..6998b10 100644
--- a/server/site_tests/firmware_CorruptKernelB/control
+++ b/server/site_tests/firmware_CorruptKernelB/control
@@ -26,6 +26,7 @@
 def run_corruptkernelb(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_CorruptKernelB", host=host, cmdline_args=args,
-                 use_faft=True, dev_mode=False, tag="normal")
+                 use_faft=True, disable_sysinfo=True,
+                 dev_mode=False, tag="normal")
 
 parallel_simple(run_corruptkernelb, machines)
diff --git a/server/site_tests/firmware_CorruptKernelB/control.dev b/server/site_tests/firmware_CorruptKernelB/control.dev
index 8a9bbdf..cf79a8f 100644
--- a/server/site_tests/firmware_CorruptKernelB/control.dev
+++ b/server/site_tests/firmware_CorruptKernelB/control.dev
@@ -26,6 +26,7 @@
 def run_corruptkernelb(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_CorruptKernelB", host=host, cmdline_args=args,
-                 use_faft=True, dev_mode=True, tag="dev")
+                 use_faft=True, disable_sysinfo=True,
+                 dev_mode=True, tag="dev")
 
 parallel_simple(run_corruptkernelb, machines)
diff --git a/server/site_tests/firmware_DevBootUSB/control b/server/site_tests/firmware_DevBootUSB/control
index 34eb755..890438d 100644
--- a/server/site_tests/firmware_DevBootUSB/control
+++ b/server/site_tests/firmware_DevBootUSB/control
@@ -28,6 +28,7 @@
 def run_devbootusb(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_DevBootUSB", host=host, cmdline_args=args,
-                 use_faft=True, dev_mode=True, tag="dev")
+                 use_faft=True, disable_sysinfo=True,
+                 dev_mode=True, tag="dev")
 
 parallel_simple(run_devbootusb, machines)
diff --git a/server/site_tests/firmware_DevFwNormalBoot/control b/server/site_tests/firmware_DevFwNormalBoot/control
index efde720..fe0c94e 100644
--- a/server/site_tests/firmware_DevFwNormalBoot/control
+++ b/server/site_tests/firmware_DevFwNormalBoot/control
@@ -28,6 +28,7 @@
 def run_devfwnormalboot(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_DevFwNormalBoot", host=host, cmdline_args=args,
-                 use_faft=True, dev_mode=True, tag="dev")
+                 use_faft=True, disable_sysinfo=True,
+                 dev_mode=True, tag="dev")
 
 parallel_simple(run_devfwnormalboot, machines)
diff --git a/server/site_tests/firmware_DevMode/control b/server/site_tests/firmware_DevMode/control
index 182f6be..22dc3fd 100644
--- a/server/site_tests/firmware_DevMode/control
+++ b/server/site_tests/firmware_DevMode/control
@@ -24,6 +24,7 @@
 def run_devmode(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_DevMode", host=host, cmdline_args=args,
-                 use_faft=True, dev_mode=False, tag="normal")
+                 use_faft=True, disable_sysinfo=True,
+                 dev_mode=False, tag="normal")
 
 parallel_simple(run_devmode, machines)
diff --git a/server/site_tests/firmware_DevModeStress/control b/server/site_tests/firmware_DevModeStress/control
index 9922ff9..1b3e5f3 100644
--- a/server/site_tests/firmware_DevModeStress/control
+++ b/server/site_tests/firmware_DevModeStress/control
@@ -25,6 +25,6 @@
 def run_devmodestress(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_DevModeStress", host=host, cmdline_args=args,
-                 use_faft=True, dev_mode=True, tag="dev")
+                 use_faft=True, disable_sysinfo=True, dev_mode=True, tag="dev")
 
 parallel_simple(run_devmodestress, machines)
diff --git a/server/site_tests/firmware_DevScreenTimeout/control b/server/site_tests/firmware_DevScreenTimeout/control
index edc3101..8fcde44 100644
--- a/server/site_tests/firmware_DevScreenTimeout/control
+++ b/server/site_tests/firmware_DevScreenTimeout/control
@@ -32,6 +32,7 @@
 def run_devscreentimeout(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_DevScreenTimeout", host=host, cmdline_args=args,
-                 use_faft=True, dev_mode=True, tag="dev")
+                 use_faft=True, disable_sysinfo=True,
+                 dev_mode=True, tag="dev")
 
 parallel_simple(run_devscreentimeout, machines)
diff --git a/server/site_tests/firmware_DevTriggerRecovery/control b/server/site_tests/firmware_DevTriggerRecovery/control
index 886a990..c723c8a 100644
--- a/server/site_tests/firmware_DevTriggerRecovery/control
+++ b/server/site_tests/firmware_DevTriggerRecovery/control
@@ -27,6 +27,7 @@
 def run_devtriggerrecovery(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_DevTriggerRecovery", host=host, cmdline_args=args,
-                 use_faft=True, dev_mode=False, tag="normal")
+                 use_faft=True, disable_sysinfo=True,
+                 dev_mode=False, tag="normal")
 
 parallel_simple(run_devtriggerrecovery, machines)
diff --git a/server/site_tests/firmware_ECAdc/control b/server/site_tests/firmware_ECAdc/control
index 1d2af0d..1c627f7 100644
--- a/server/site_tests/firmware_ECAdc/control
+++ b/server/site_tests/firmware_ECAdc/control
@@ -24,6 +24,6 @@
 def run_ecadc(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_ECAdc", host=host, cmdline_args=args,
-                 use_faft=True)
+                 use_faft=True, disable_sysinfo=True)
 
 parallel_simple(run_ecadc, machines)
diff --git a/server/site_tests/firmware_ECBattery/control b/server/site_tests/firmware_ECBattery/control
index 6aa596c..85dd619 100644
--- a/server/site_tests/firmware_ECBattery/control
+++ b/server/site_tests/firmware_ECBattery/control
@@ -24,6 +24,6 @@
 def run_ecbattery(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_ECBattery", host=host, cmdline_args=args,
-                 use_faft=True)
+                 use_faft=True, disable_sysinfo=True)
 
 parallel_simple(run_ecbattery, machines)
diff --git a/server/site_tests/firmware_ECBootTime/control b/server/site_tests/firmware_ECBootTime/control
index 084df1a..4457fc2 100644
--- a/server/site_tests/firmware_ECBootTime/control
+++ b/server/site_tests/firmware_ECBootTime/control
@@ -24,6 +24,6 @@
 def run_ecboottime(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_ECBootTime", host=host, cmdline_args=args,
-                 use_faft=True)
+                 use_faft=True, disable_sysinfo=True)
 
 parallel_simple(run_ecboottime, machines)
diff --git a/server/site_tests/firmware_ECCharging/control b/server/site_tests/firmware_ECCharging/control
index 282a8c7..da0676c 100644
--- a/server/site_tests/firmware_ECCharging/control
+++ b/server/site_tests/firmware_ECCharging/control
@@ -28,6 +28,6 @@
 def run_eccharging(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_ECCharging", host=host, cmdline_args=args,
-                 use_faft=True)
+                 use_faft=True, disable_sysinfo=True)
 
 parallel_simple(run_eccharging, machines)
diff --git a/server/site_tests/firmware_ECKeyboard/control b/server/site_tests/firmware_ECKeyboard/control
index 5ff4fcf..f15b394 100644
--- a/server/site_tests/firmware_ECKeyboard/control
+++ b/server/site_tests/firmware_ECKeyboard/control
@@ -24,6 +24,6 @@
 def run_eckeyboard(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_ECKeyboard", host=host, cmdline_args=args,
-                 use_faft=True)
+                 use_faft=True, disable_sysinfo=True)
 
 parallel_simple(run_eckeyboard, machines)
diff --git a/server/site_tests/firmware_ECLidSwitch/control b/server/site_tests/firmware_ECLidSwitch/control
index 2103bfd..33fee4d 100644
--- a/server/site_tests/firmware_ECLidSwitch/control
+++ b/server/site_tests/firmware_ECLidSwitch/control
@@ -29,6 +29,6 @@
 def run_eclidswitch(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_ECLidSwitch", host=host, cmdline_args=args,
-                 use_faft=True)
+                 use_faft=True, disable_sysinfo=True)
 
 parallel_simple(run_eclidswitch, machines)
diff --git a/server/site_tests/firmware_ECPeci/control b/server/site_tests/firmware_ECPeci/control
index ec8c06e..2cb0d01 100644
--- a/server/site_tests/firmware_ECPeci/control
+++ b/server/site_tests/firmware_ECPeci/control
@@ -25,6 +25,6 @@
 def run_ecpeci(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_ECPeci", host=host, cmdline_args=args,
-                 use_faft=True)
+                 use_faft=True, disable_sysinfo=True)
 
 parallel_simple(run_ecpeci, machines)
diff --git a/server/site_tests/firmware_ECPowerButton/control b/server/site_tests/firmware_ECPowerButton/control
index 38bcc02..178020b 100644
--- a/server/site_tests/firmware_ECPowerButton/control
+++ b/server/site_tests/firmware_ECPowerButton/control
@@ -30,6 +30,6 @@
 def run_ecpowerbutton(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_ECPowerButton", host=host, cmdline_args=args,
-                 use_faft=True)
+                 use_faft=True, disable_sysinfo=True)
 
 parallel_simple(run_ecpowerbutton, machines)
diff --git a/server/site_tests/firmware_ECPowerG3/control b/server/site_tests/firmware_ECPowerG3/control
index 164a1a3..a3d1b49 100644
--- a/server/site_tests/firmware_ECPowerG3/control
+++ b/server/site_tests/firmware_ECPowerG3/control
@@ -24,6 +24,6 @@
 def run_ecpowerg3(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_ECPowerG3", host=host, cmdline_args=args,
-                 use_faft=True)
+                 use_faft=True, disable_sysinfo=True)
 
 parallel_simple(run_ecpowerg3, machines)
diff --git a/server/site_tests/firmware_ECSharedMem/control b/server/site_tests/firmware_ECSharedMem/control
index 894b090..d3a075f 100644
--- a/server/site_tests/firmware_ECSharedMem/control
+++ b/server/site_tests/firmware_ECSharedMem/control
@@ -27,6 +27,6 @@
 def run_ecsharedmem(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_ECSharedMem", host=host, cmdline_args=args,
-                 use_faft=True)
+                 use_faft=True, disable_sysinfo=True)
 
 parallel_simple(run_ecsharedmem, machines)
diff --git a/server/site_tests/firmware_ECThermal/control b/server/site_tests/firmware_ECThermal/control
index d48ef76..7365066 100644
--- a/server/site_tests/firmware_ECThermal/control
+++ b/server/site_tests/firmware_ECThermal/control
@@ -25,6 +25,6 @@
 def run_ecthermal(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_ECThermal", host=host, cmdline_args=args,
-                 use_faft=True)
+                 use_faft=True, disable_sysinfo=True)
 
 parallel_simple(run_ecthermal, machines)
diff --git a/server/site_tests/firmware_ECUsbPorts/control b/server/site_tests/firmware_ECUsbPorts/control
index 106d7f0..0a22508 100644
--- a/server/site_tests/firmware_ECUsbPorts/control
+++ b/server/site_tests/firmware_ECUsbPorts/control
@@ -24,6 +24,6 @@
 def run_ecusbports(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_ECUsbPorts", host=host, cmdline_args=args,
-                 use_faft=True)
+                 use_faft=True, disable_sysinfo=True)
 
 parallel_simple(run_ecusbports, machines)
diff --git a/server/site_tests/firmware_ECWakeSource/control b/server/site_tests/firmware_ECWakeSource/control
index b21b188..e9c1d06 100644
--- a/server/site_tests/firmware_ECWakeSource/control
+++ b/server/site_tests/firmware_ECWakeSource/control
@@ -25,6 +25,6 @@
 def run_ecwakesource(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_ECWakeSource", host=host, cmdline_args=args,
-                 use_faft=True)
+                 use_faft=True, disable_sysinfo=True)
 
 parallel_simple(run_ecwakesource, machines)
diff --git a/server/site_tests/firmware_ECWatchdog/control b/server/site_tests/firmware_ECWatchdog/control
index 27d9ec1..a3b62a0 100644
--- a/server/site_tests/firmware_ECWatchdog/control
+++ b/server/site_tests/firmware_ECWatchdog/control
@@ -24,6 +24,6 @@
 def run_ecwatchdog(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_ECWatchdog", host=host, cmdline_args=args,
-                 use_faft=True)
+                 use_faft=True, disable_sysinfo=True)
 
 parallel_simple(run_ecwatchdog, machines)
diff --git a/server/site_tests/firmware_ECWriteProtect/control b/server/site_tests/firmware_ECWriteProtect/control
index 01a113e..df6f8aa 100644
--- a/server/site_tests/firmware_ECWriteProtect/control
+++ b/server/site_tests/firmware_ECWriteProtect/control
@@ -36,6 +36,7 @@
 def run_ecwriteprotect(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_ECWriteProtect", host=host, cmdline_args=args,
-                 use_faft=True, dev_mode=False, tag="normal")
+                 use_faft=True, disable_sysinfo=True,
+                 dev_mode=False, tag="normal")
 
 parallel_simple(run_ecwriteprotect, machines)
diff --git a/server/site_tests/firmware_ECWriteProtect/control.dev b/server/site_tests/firmware_ECWriteProtect/control.dev
index 441615d..4f1866c 100644
--- a/server/site_tests/firmware_ECWriteProtect/control.dev
+++ b/server/site_tests/firmware_ECWriteProtect/control.dev
@@ -35,6 +35,7 @@
 def run_ecwriteprotect(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_ECWriteProtect", host=host, cmdline_args=args,
-                 use_faft=True, dev_mode=True, tag="dev")
+                 use_faft=True, disable_sysinfo=True,
+                 dev_mode=True, tag="dev")
 
 parallel_simple(run_ecwriteprotect, machines)
diff --git a/server/site_tests/firmware_FAFTSetup/control b/server/site_tests/firmware_FAFTSetup/control
index 09f1d11..d9b0669 100644
--- a/server/site_tests/firmware_FAFTSetup/control
+++ b/server/site_tests/firmware_FAFTSetup/control
@@ -35,6 +35,6 @@
 def run_faftsetup(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_FAFTSetup", host=host, cmdline_args=args,
-                 use_faft=True)
+                 use_faft=True, disable_sysinfo=True)
 
 parallel_simple(run_faftsetup, machines)
diff --git a/server/site_tests/firmware_FwScreenCloseLid/control b/server/site_tests/firmware_FwScreenCloseLid/control
index acee65f..f209bfa 100644
--- a/server/site_tests/firmware_FwScreenCloseLid/control
+++ b/server/site_tests/firmware_FwScreenCloseLid/control
@@ -27,6 +27,7 @@
 def run_fwscreencloselid(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_FwScreenCloseLid", host=host, cmdline_args=args,
-                 use_faft=True, dev_mode=True, tag="dev")
+                 use_faft=True, disable_sysinfo=True,
+                 dev_mode=True, tag="dev")
 
 parallel_simple(run_fwscreencloselid, machines)
diff --git a/server/site_tests/firmware_FwScreenPressPower/control b/server/site_tests/firmware_FwScreenPressPower/control
index af1dd5f..8e3f00b 100644
--- a/server/site_tests/firmware_FwScreenPressPower/control
+++ b/server/site_tests/firmware_FwScreenPressPower/control
@@ -27,6 +27,7 @@
 def run_fwscreenpresspower(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_FwScreenPressPower", host=host, cmdline_args=args,
-                 use_faft=True, dev_mode=True, tag="dev")
+                 use_faft=True, disable_sysinfo=True,
+                 dev_mode=True, tag="dev")
 
 parallel_simple(run_fwscreenpresspower, machines)
diff --git a/server/site_tests/firmware_InvalidUSB/control b/server/site_tests/firmware_InvalidUSB/control
index 566f883..3170210 100644
--- a/server/site_tests/firmware_InvalidUSB/control
+++ b/server/site_tests/firmware_InvalidUSB/control
@@ -27,6 +27,7 @@
 def run_invalidusb(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_InvalidUSB", host=host, cmdline_args=args,
-                 use_faft=True, dev_mode=False, tag="normal")
+                 use_faft=True, disable_sysinfo=True,
+                 dev_mode=False, tag="normal")
 
 parallel_simple(run_invalidusb, machines)
diff --git a/server/site_tests/firmware_RONormalBoot/control b/server/site_tests/firmware_RONormalBoot/control
index 92b325d..db7e886 100644
--- a/server/site_tests/firmware_RONormalBoot/control
+++ b/server/site_tests/firmware_RONormalBoot/control
@@ -24,6 +24,7 @@
 def run_ronormalboot(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_RONormalBoot", host=host, cmdline_args=args,
-                 use_faft=True, dev_mode=False, tag="normal")
+                 use_faft=True, disable_sysinfo=True,
+                 dev_mode=False, tag="normal")
 
 parallel_simple(run_ronormalboot, machines)
diff --git a/server/site_tests/firmware_RONormalBoot/control.dev b/server/site_tests/firmware_RONormalBoot/control.dev
index 3b47167..9bea459 100644
--- a/server/site_tests/firmware_RONormalBoot/control.dev
+++ b/server/site_tests/firmware_RONormalBoot/control.dev
@@ -24,6 +24,7 @@
 def run_ronormalboot(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_RONormalBoot", host=host, cmdline_args=args,
-                 use_faft=True, dev_mode=True, tag="dev")
+                 use_faft=True, disable_sysinfo=True,
+                 dev_mode=True, tag="dev")
 
 parallel_simple(run_ronormalboot, machines)
diff --git a/server/site_tests/firmware_RecoveryButton/control b/server/site_tests/firmware_RecoveryButton/control
index a6e06d4..b12e9c3 100644
--- a/server/site_tests/firmware_RecoveryButton/control
+++ b/server/site_tests/firmware_RecoveryButton/control
@@ -27,6 +27,7 @@
 def run_recoverybutton(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_RecoveryButton", host=host, cmdline_args=args,
-                 use_faft=True, dev_mode=False, tag="normal")
+                 use_faft=True, disable_sysinfo=True,
+                 dev_mode=False, tag="normal")
 
 parallel_simple(run_recoverybutton, machines)
diff --git a/server/site_tests/firmware_RecoveryButton/control.dev b/server/site_tests/firmware_RecoveryButton/control.dev
index e7f2590..450a1ef 100644
--- a/server/site_tests/firmware_RecoveryButton/control.dev
+++ b/server/site_tests/firmware_RecoveryButton/control.dev
@@ -27,6 +27,7 @@
 def run_recoverybutton(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_RecoveryButton", host=host, cmdline_args=args,
-                 use_faft=True, dev_mode=True, tag="dev")
+                 use_faft=True, disable_sysinfo=True,
+                 dev_mode=True, tag="dev")
 
 parallel_simple(run_recoverybutton, machines)
diff --git a/server/site_tests/firmware_RollbackFirmware/control b/server/site_tests/firmware_RollbackFirmware/control
index 3a04309..15f0eca 100644
--- a/server/site_tests/firmware_RollbackFirmware/control
+++ b/server/site_tests/firmware_RollbackFirmware/control
@@ -27,6 +27,7 @@
 def run_rollbackfirmware(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_RollbackFirmware", host=host, cmdline_args=args,
-                 use_faft=True, dev_mode=False, tag="normal")
+                 use_faft=True, disable_sysinfo=True,
+                 dev_mode=False, tag="normal")
 
 parallel_simple(run_rollbackfirmware, machines)
diff --git a/server/site_tests/firmware_RollbackFirmware/control.dev b/server/site_tests/firmware_RollbackFirmware/control.dev
index 69e0944..cc7b022 100644
--- a/server/site_tests/firmware_RollbackFirmware/control.dev
+++ b/server/site_tests/firmware_RollbackFirmware/control.dev
@@ -27,6 +27,7 @@
 def run_rollbackfirmware(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_RollbackFirmware", host=host, cmdline_args=args,
-                 use_faft=True, dev_mode=True, tag="dev")
+                 use_faft=True, disable_sysinfo=True,
+                 dev_mode=True, tag="dev")
 
 parallel_simple(run_rollbackfirmware, machines)
diff --git a/server/site_tests/firmware_RollbackKernel/control b/server/site_tests/firmware_RollbackKernel/control
index 073dd5a..9260326 100644
--- a/server/site_tests/firmware_RollbackKernel/control
+++ b/server/site_tests/firmware_RollbackKernel/control
@@ -28,6 +28,7 @@
 def run_rollbackkernel(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_RollbackKernel", host=host, cmdline_args=args,
-                 use_faft=True, dev_mode=False, tag="normal")
+                 use_faft=True, disable_sysinfo=True,
+                 dev_mode=False, tag="normal")
 
 parallel_simple(run_rollbackkernel, machines)
diff --git a/server/site_tests/firmware_RollbackKernel/control.dev b/server/site_tests/firmware_RollbackKernel/control.dev
index 7fe9dda..d55fe29 100644
--- a/server/site_tests/firmware_RollbackKernel/control.dev
+++ b/server/site_tests/firmware_RollbackKernel/control.dev
@@ -28,6 +28,7 @@
 def run_rollbackkernel(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_RollbackKernel", host=host, cmdline_args=args,
-                 use_faft=True, dev_mode=True, tag="dev")
+                 use_faft=True, disable_sysinfo=True,
+                 dev_mode=True, tag="dev")
 
 parallel_simple(run_rollbackkernel, machines)
diff --git a/server/site_tests/firmware_ShellBall/control b/server/site_tests/firmware_ShellBall/control
index 92b777a..996637b 100644
--- a/server/site_tests/firmware_ShellBall/control
+++ b/server/site_tests/firmware_ShellBall/control
@@ -39,6 +39,6 @@
                  cmdline_args=args,
                  shellball_path=opts['shellball_path'],
                  shellball_name=opts['shellball_name'],
-                 use_faft=True)
+                 use_faft=True, disable_sysinfo=True)
 
 parallel_simple(run_shellball, machines)
diff --git a/server/site_tests/firmware_SoftwareSync/control b/server/site_tests/firmware_SoftwareSync/control
index a9df477..729f99d 100644
--- a/server/site_tests/firmware_SoftwareSync/control
+++ b/server/site_tests/firmware_SoftwareSync/control
@@ -24,6 +24,7 @@
 def run_softwaresync(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_SoftwareSync", host=host, cmdline_args=args,
-                 use_faft=True, dev_mode=False, tag="normal")
+                 use_faft=True, disable_sysinfo=True,
+                 dev_mode=False, tag="normal")
 
 parallel_simple(run_softwaresync, machines)
diff --git a/server/site_tests/firmware_SoftwareSync/control.dev b/server/site_tests/firmware_SoftwareSync/control.dev
index 16c4875..a77b26a 100644
--- a/server/site_tests/firmware_SoftwareSync/control.dev
+++ b/server/site_tests/firmware_SoftwareSync/control.dev
@@ -23,6 +23,7 @@
 def run_softwaresync(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_SoftwareSync", host=host, cmdline_args=args,
-                 use_faft=True, dev_mode=True, tag="dev")
+                 use_faft=True, disable_sysinfo=True,
+                 dev_mode=True, tag="dev")
 
 parallel_simple(run_softwaresync, machines)
diff --git a/server/site_tests/firmware_TryFwB/control b/server/site_tests/firmware_TryFwB/control
index fbf800c..18c1404 100644
--- a/server/site_tests/firmware_TryFwB/control
+++ b/server/site_tests/firmware_TryFwB/control
@@ -24,6 +24,7 @@
 def run_tryfwb(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_TryFwB", host=host, cmdline_args=args,
-                 use_faft=True, dev_mode=False, tag="normal")
+                 use_faft=True, disable_sysinfo=True,
+                 dev_mode=False, tag="normal")
 
 parallel_simple(run_tryfwb, machines)
diff --git a/server/site_tests/firmware_TryFwB/control.dev b/server/site_tests/firmware_TryFwB/control.dev
index 99526e1..934b802 100644
--- a/server/site_tests/firmware_TryFwB/control.dev
+++ b/server/site_tests/firmware_TryFwB/control.dev
@@ -24,6 +24,7 @@
 def run_tryfwb(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_TryFwB", host=host, cmdline_args=args,
-                 use_faft=True, dev_mode=True, tag="dev")
+                 use_faft=True, disable_sysinfo=True,
+                 dev_mode=True, tag="dev")
 
 parallel_simple(run_tryfwb, machines)
diff --git a/server/site_tests/firmware_UpdateECBin/control b/server/site_tests/firmware_UpdateECBin/control
index 184249e..6c87fae 100644
--- a/server/site_tests/firmware_UpdateECBin/control
+++ b/server/site_tests/firmware_UpdateECBin/control
@@ -55,6 +55,7 @@
 def run_updateec(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_UpdateECBin", host=host, cmdline_args=args,
-                 use_faft=True, dev_mode=False, tag="normal")
+                 use_faft=True, disable_sysinfo=True,
+                 dev_mode=False, tag="normal")
 
 parallel_simple(run_updateec, machines)
diff --git a/server/site_tests/firmware_UpdateECBin/control.dev b/server/site_tests/firmware_UpdateECBin/control.dev
index 26609a1..3cdf8e2 100644
--- a/server/site_tests/firmware_UpdateECBin/control.dev
+++ b/server/site_tests/firmware_UpdateECBin/control.dev
@@ -55,6 +55,7 @@
 def run_updateec(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_UpdateECBin", host=host, cmdline_args=args,
-                 use_faft=True, dev_mode=True, tag="dev")
+                 use_faft=True, disable_sysinfo=True,
+                 dev_mode=True, tag="dev")
 
 parallel_simple(run_updateec, machines)
diff --git a/server/site_tests/firmware_UpdateFirmwareDataKeyVersion/control b/server/site_tests/firmware_UpdateFirmwareDataKeyVersion/control
index 7bef076..b3d6352 100644
--- a/server/site_tests/firmware_UpdateFirmwareDataKeyVersion/control
+++ b/server/site_tests/firmware_UpdateFirmwareDataKeyVersion/control
@@ -42,7 +42,7 @@
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_UpdateFirmwareDataKeyVersion",
                  host=host, cmdline_args=args,
-                 use_faft=True)
+                 use_faft=True, disable_sysinfo=True)
 
 # TODO(waihong@chromium.org): Temporarily mask this test until we adds the
 # check of factory install shim. Otherwise, forgetting to insert a factory
diff --git a/server/site_tests/firmware_UpdateFirmwareVersion/control b/server/site_tests/firmware_UpdateFirmwareVersion/control
index e5eecf8..1f633aa 100644
--- a/server/site_tests/firmware_UpdateFirmwareVersion/control
+++ b/server/site_tests/firmware_UpdateFirmwareVersion/control
@@ -43,7 +43,7 @@
 def run_updatefirmwareversion(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_UpdateFirmwareVersion", host=host, cmdline_args=args,
-                 use_faft=True)
+                 use_faft=True, disable_sysinfo=True)
 
 # TODO(waihong@chromium.org): Temporarily mask this test until we adds the
 # check of factory install shim. Otherwise, forgetting to insert a factory
diff --git a/server/site_tests/firmware_UpdateKernelDataKeyVersion/control b/server/site_tests/firmware_UpdateKernelDataKeyVersion/control
index 2d9d8fa..be9fea5 100644
--- a/server/site_tests/firmware_UpdateKernelDataKeyVersion/control
+++ b/server/site_tests/firmware_UpdateKernelDataKeyVersion/control
@@ -37,6 +37,7 @@
 def run_updatekerneldatakeyversion(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_UpdateKernelDataKeyVersion", host=host,
-                 cmdline_args=args, use_faft=True, dev_mode=True, tag="dev")
+                 cmdline_args=args,use_faft=True, disable_sysinfo=True,
+                 dev_mode=True, tag="dev")
 
 parallel_simple(run_updatekerneldatakeyversion, machines)
diff --git a/server/site_tests/firmware_UpdateKernelSubkeyVersion/control b/server/site_tests/firmware_UpdateKernelSubkeyVersion/control
index 893292b..226874e 100644
--- a/server/site_tests/firmware_UpdateKernelSubkeyVersion/control
+++ b/server/site_tests/firmware_UpdateKernelSubkeyVersion/control
@@ -34,6 +34,6 @@
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_UpdateKernelSubkeyVersion",
                  host=host, cmdline_args=args,
-                 use_faft=True)
+                 use_faft=True, disable_sysinfo=True)
 
 parallel_simple(run_updatekernelsubkeyversion, machines)
diff --git a/server/site_tests/firmware_UpdateKernelVersion/control b/server/site_tests/firmware_UpdateKernelVersion/control
index e18c646..009e7fe 100644
--- a/server/site_tests/firmware_UpdateKernelVersion/control
+++ b/server/site_tests/firmware_UpdateKernelVersion/control
@@ -35,6 +35,7 @@
 def run_updatekernelversion(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_UpdateKernelVersion", host=host, cmdline_args=args,
-                 use_faft=True, dev_mode=True, tag="dev")
+                 use_faft=True, disable_sysinfo=True,
+                 dev_mode=True, tag="dev")
 
 parallel_simple(run_updatekernelversion, machines)
diff --git a/server/site_tests/firmware_UserRequestRecovery/control b/server/site_tests/firmware_UserRequestRecovery/control
index 98b70eb..a9d05ae 100644
--- a/server/site_tests/firmware_UserRequestRecovery/control
+++ b/server/site_tests/firmware_UserRequestRecovery/control
@@ -28,6 +28,7 @@
 def run_userrequestrecovery(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_UserRequestRecovery", host=host, cmdline_args=args,
-                 use_faft=True, dev_mode=False, tag="normal")
+                 use_faft=True, disable_sysinfo=True,
+                 dev_mode=False, tag="normal")
 
 parallel_simple(run_userrequestrecovery, machines)
diff --git a/server/site_tests/firmware_UserRequestRecovery/control.dev b/server/site_tests/firmware_UserRequestRecovery/control.dev
index 2f42251..c1c9fc7 100644
--- a/server/site_tests/firmware_UserRequestRecovery/control.dev
+++ b/server/site_tests/firmware_UserRequestRecovery/control.dev
@@ -28,6 +28,7 @@
 def run_userrequestrecovery(machine):
     host = hosts.create_host(machine, servo_args=servo_args)
     job.run_test("firmware_UserRequestRecovery", host=host, cmdline_args=args,
-                 use_faft=True, dev_mode=True, tag="dev")
+                 use_faft=True, disable_sysinfo=True,
+                 dev_mode=True, tag="dev")
 
 parallel_simple(run_userrequestrecovery, machines)
diff --git a/server/site_tests/suites/control.faft_bios b/server/site_tests/suites/control.faft_bios
index 282e700..dc8afad 100644
--- a/server/site_tests/suites/control.faft_bios
+++ b/server/site_tests/suites/control.faft_bios
@@ -58,9 +58,13 @@
     client = hosts.create_host(machine, servo_args=servo_args)
     for test, argv in TESTS_ON_BOTH_MODES + TESTS_ON_NORMAL_MODE:
         job.run_test(test, host=client, cmdline_args=args,
-                     use_faft=True, dev_mode=False, tag="normal", **argv)
+                     use_faft=True, disable_sysinfo=True,
+                     dev_mode=False, tag="normal",
+                     **argv)
     for test, argv in TESTS_ON_BOTH_MODES + TESTS_ON_DEV_MODE:
         job.run_test(test, host=client, cmdline_args=args,
-                     use_faft=True, dev_mode=True, tag="dev", **argv)
+                     use_faft=True, disable_sysinfo=True,
+                     dev_mode=True, tag="dev",
+                     **argv)
 
 parallel_simple(run_server_test, machines)
diff --git a/server/site_tests/suites/control.faft_lv1 b/server/site_tests/suites/control.faft_lv1
index 33e6f3a..82834af 100644
--- a/server/site_tests/suites/control.faft_lv1
+++ b/server/site_tests/suites/control.faft_lv1
@@ -44,9 +44,13 @@
     client = hosts.create_host(machine, servo_args=servo_args)
     for test, argv in TESTS_ON_BOTH_MODES + TESTS_ON_NORMAL_MODE:
         job.run_test(test, host=client, cmdline_args=args,
-                     use_faft=True, dev_mode=False, tag="normal", **argv)
+                     use_faft=True, disable_sysinfo=True,
+                     dev_mode=False, tag="normal",
+                     **argv)
     for test, argv in TESTS_ON_BOTH_MODES + TESTS_ON_DEV_MODE:
         job.run_test(test, host=client, cmdline_args=args,
-                     use_faft=True, dev_mode=True, tag="dev", **argv)
+                     use_faft=True, disable_sysinfo=True,
+                     dev_mode=True, tag="dev",
+                     **argv)
 
 parallel_simple(run_server_test, machines)
diff --git a/server/site_tests/suites/control.faft_lv2 b/server/site_tests/suites/control.faft_lv2
index b8ce867..8cc33e2 100644
--- a/server/site_tests/suites/control.faft_lv2
+++ b/server/site_tests/suites/control.faft_lv2
@@ -48,9 +48,13 @@
     client = hosts.create_host(machine, servo_args=servo_args)
     for test, argv in TESTS_ON_BOTH_MODES + TESTS_ON_NORMAL_MODE:
         job.run_test(test, host=client, cmdline_args=args,
-                     use_faft=True, dev_mode=False, tag="normal", **argv)
+                     use_faft=True, disable_sysinfo=True,
+                     dev_mode=False, tag="normal",
+                     **argv)
     for test, argv in TESTS_ON_BOTH_MODES + TESTS_ON_DEV_MODE:
         job.run_test(test, host=client, cmdline_args=args,
-                     use_faft=True, dev_mode=True, tag="dev", **argv)
+                     use_faft=True, disable_sysinfo=True,
+                     dev_mode=True, tag="dev",
+                     **argv)
 
 parallel_simple(run_server_test, machines)
diff --git a/server/site_tests/suites/control.faft_lv3 b/server/site_tests/suites/control.faft_lv3
index 8db022b..4c6db60 100644
--- a/server/site_tests/suites/control.faft_lv3
+++ b/server/site_tests/suites/control.faft_lv3
@@ -54,9 +54,13 @@
     client = hosts.create_host(machine, servo_args=servo_args)
     for test, argv in TESTS_ON_BOTH_MODES + TESTS_ON_NORMAL_MODE:
         job.run_test(test, host=client, cmdline_args=args,
-                     use_faft=True, dev_mode=False, tag="normal", **argv)
+                     use_faft=True, disable_sysinfo=True,
+                     dev_mode=False, tag="normal",
+                     **argv)
     for test, argv in TESTS_ON_BOTH_MODES + TESTS_ON_DEV_MODE:
         job.run_test(test, host=client, cmdline_args=args,
-                     use_faft=True, dev_mode=True, tag="dev", **argv)
+                     use_faft=True, disable_sysinfo=True,
+                     dev_mode=True, tag="dev",
+                     **argv)
 
 parallel_simple(run_server_test, machines)
diff --git a/server/site_tests/suites/control.faft_lv4 b/server/site_tests/suites/control.faft_lv4
index f52c4bd..aae6b86 100644
--- a/server/site_tests/suites/control.faft_lv4
+++ b/server/site_tests/suites/control.faft_lv4
@@ -47,9 +47,13 @@
     client = hosts.create_host(machine, servo_args=servo_args)
     for test, argv in TESTS_ON_BOTH_MODES + TESTS_ON_NORMAL_MODE:
         job.run_test(test, host=client, cmdline_args=args,
-                     use_faft=True, dev_mode=False, tag="normal", **argv)
+                     use_faft=True, disable_sysinfo=True,
+                     dev_mode=False, tag="normal",
+                     **argv)
     for test, argv in TESTS_ON_BOTH_MODES + TESTS_ON_DEV_MODE:
         job.run_test(test, host=client, cmdline_args=args,
-                     use_faft=True, dev_mode=True, tag="dev", **argv)
+                     use_faft=True, disable_sysinfo=True,
+                     dev_mode=True, tag="dev",
+                     **argv)
 
 parallel_simple(run_server_test, machines)