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

local_dash (generate_test_report) gets fw versions by parsing sysinfo dir.
However, FAFT tests disable sysinfo. local_dash was able to get fw versions
because they also run firmware_FAFTClient with sysinfo enabled.

A recent change makes FAFT tests no longer run firmware_FAFTClient:
    https://gerrit.chromium.org/gerrit/37697

So local_dash failed to generate a correct json file then. This CL is to
enable sysinfo and makes local_dash works again.

BUG=chromium-os:36163
TEST=Run a FAFT test and call local_dash to update the json file.

Change-Id: I72fba6c31443bccd0c9c9eaca5ff017dafb9e68d
Reviewed-on: https://gerrit.chromium.org/gerrit/37881
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 65ae527..bbf7498 100644
--- a/server/site_tests/firmware_CgptState/control
+++ b/server/site_tests/firmware_CgptState/control
@@ -30,7 +30,6 @@
 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, disable_sysinfo=True,
-                 dev_mode=False, tag="normal")
+                 use_faft=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 24ea2e6..64b0155 100644
--- a/server/site_tests/firmware_CgptStress/control
+++ b/server/site_tests/firmware_CgptStress/control
@@ -26,7 +26,6 @@
 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, disable_sysinfo=True,
-                 dev_mode=False, tag="normal")
+                 use_faft=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 1487c95..10782e4 100644
--- a/server/site_tests/firmware_CgptStress/control.dev
+++ b/server/site_tests/firmware_CgptStress/control.dev
@@ -26,7 +26,6 @@
 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, disable_sysinfo=True,
-                 dev_mode=True, tag="dev")
+                 use_faft=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 b9bdd06..67d4208 100644
--- a/server/site_tests/firmware_ConsecutiveBoot/control
+++ b/server/site_tests/firmware_ConsecutiveBoot/control
@@ -28,7 +28,6 @@
 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, disable_sysinfo=True,
-                 dev_mode=False, tag="normal")
+                 use_faft=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 8888204..f817188 100644
--- a/server/site_tests/firmware_ConsecutiveBoot/control.dev
+++ b/server/site_tests/firmware_ConsecutiveBoot/control.dev
@@ -28,7 +28,6 @@
 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, disable_sysinfo=True,
-                 dev_mode=True, tag="dev")
+                 use_faft=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 df2568a..5d65bd8 100644
--- a/server/site_tests/firmware_CorruptBothFwBodyAB/control
+++ b/server/site_tests/firmware_CorruptBothFwBodyAB/control
@@ -32,7 +32,6 @@
 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, disable_sysinfo=True,
-                 dev_mode=False, tag="normal")
+                 use_faft=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 39fdc60..2e108ff 100644
--- a/server/site_tests/firmware_CorruptBothFwBodyAB/control.dev
+++ b/server/site_tests/firmware_CorruptBothFwBodyAB/control.dev
@@ -32,7 +32,6 @@
 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, disable_sysinfo=True,
-                 dev_mode=True, tag="dev")
+                 use_faft=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 faf52df..76db663 100644
--- a/server/site_tests/firmware_CorruptBothFwSigAB/control
+++ b/server/site_tests/firmware_CorruptBothFwSigAB/control
@@ -28,7 +28,6 @@
 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, disable_sysinfo=True,
-                 dev_mode=False, tag="normal")
+                 use_faft=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 3788dc2..18d0060 100644
--- a/server/site_tests/firmware_CorruptBothFwSigAB/control.dev
+++ b/server/site_tests/firmware_CorruptBothFwSigAB/control.dev
@@ -28,7 +28,6 @@
 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, disable_sysinfo=True,
-                 dev_mode=True, tag="dev")
+                 use_faft=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 c2d05fb..9e766c3 100644
--- a/server/site_tests/firmware_CorruptBothKernelAB/control
+++ b/server/site_tests/firmware_CorruptBothKernelAB/control
@@ -30,7 +30,6 @@
 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, disable_sysinfo=True,
-                 dev_mode=False, tag="normal")
+                 use_faft=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 caee907..645567a 100644
--- a/server/site_tests/firmware_CorruptBothKernelAB/control.dev
+++ b/server/site_tests/firmware_CorruptBothKernelAB/control.dev
@@ -30,7 +30,6 @@
 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, disable_sysinfo=True,
-                 dev_mode=True, tag="dev")
+                 use_faft=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 82b27cb..23b4c22 100644
--- a/server/site_tests/firmware_CorruptFwBodyA/control
+++ b/server/site_tests/firmware_CorruptFwBodyA/control
@@ -30,7 +30,6 @@
 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, disable_sysinfo=True,
-                 dev_mode=False, tag="normal")
+                 use_faft=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 d06f92f..7b79dc3 100644
--- a/server/site_tests/firmware_CorruptFwBodyA/control.dev
+++ b/server/site_tests/firmware_CorruptFwBodyA/control.dev
@@ -30,7 +30,6 @@
 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, disable_sysinfo=True,
-                 dev_mode=True, tag="dev")
+                 use_faft=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 50d368b..e78a601 100644
--- a/server/site_tests/firmware_CorruptFwBodyB/control
+++ b/server/site_tests/firmware_CorruptFwBodyB/control
@@ -30,7 +30,6 @@
 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, disable_sysinfo=True,
-                 dev_mode=False, tag="normal")
+                 use_faft=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 b63b5f7..3cce91f 100644
--- a/server/site_tests/firmware_CorruptFwBodyB/control.dev
+++ b/server/site_tests/firmware_CorruptFwBodyB/control.dev
@@ -30,7 +30,6 @@
 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, disable_sysinfo=True,
-                 dev_mode=True, tag="dev")
+                 use_faft=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 8bc8120..e9494f7 100644
--- a/server/site_tests/firmware_CorruptFwSigA/control
+++ b/server/site_tests/firmware_CorruptFwSigA/control
@@ -24,7 +24,6 @@
 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, disable_sysinfo=True,
-                 dev_mode=False, tag="normal")
+                 use_faft=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 23be2cd..fbafdd5 100644
--- a/server/site_tests/firmware_CorruptFwSigA/control.dev
+++ b/server/site_tests/firmware_CorruptFwSigA/control.dev
@@ -24,7 +24,6 @@
 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, disable_sysinfo=True,
-                 dev_mode=True, tag="dev")
+                 use_faft=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 4f178f5..ea7d02d 100644
--- a/server/site_tests/firmware_CorruptFwSigB/control
+++ b/server/site_tests/firmware_CorruptFwSigB/control
@@ -24,7 +24,6 @@
 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, disable_sysinfo=True,
-                 dev_mode=False, tag="normal")
+                 use_faft=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 07b7713..a5be2ff 100644
--- a/server/site_tests/firmware_CorruptFwSigB/control.dev
+++ b/server/site_tests/firmware_CorruptFwSigB/control.dev
@@ -24,7 +24,6 @@
 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, disable_sysinfo=True,
-                 dev_mode=True, tag="dev")
+                 use_faft=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 fdac5ac..2ba9136 100644
--- a/server/site_tests/firmware_CorruptKernelA/control
+++ b/server/site_tests/firmware_CorruptKernelA/control
@@ -25,7 +25,6 @@
 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, disable_sysinfo=True,
-                 dev_mode=False, tag="normal")
+                 use_faft=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 c5f7b48..555b356 100644
--- a/server/site_tests/firmware_CorruptKernelA/control.dev
+++ b/server/site_tests/firmware_CorruptKernelA/control.dev
@@ -25,7 +25,6 @@
 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, disable_sysinfo=True,
-                 dev_mode=True, tag="dev")
+                 use_faft=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 6998b10..cb03c37 100644
--- a/server/site_tests/firmware_CorruptKernelB/control
+++ b/server/site_tests/firmware_CorruptKernelB/control
@@ -26,7 +26,6 @@
 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, disable_sysinfo=True,
-                 dev_mode=False, tag="normal")
+                 use_faft=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 cf79a8f..8a9bbdf 100644
--- a/server/site_tests/firmware_CorruptKernelB/control.dev
+++ b/server/site_tests/firmware_CorruptKernelB/control.dev
@@ -26,7 +26,6 @@
 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, disable_sysinfo=True,
-                 dev_mode=True, tag="dev")
+                 use_faft=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 890438d..34eb755 100644
--- a/server/site_tests/firmware_DevBootUSB/control
+++ b/server/site_tests/firmware_DevBootUSB/control
@@ -28,7 +28,6 @@
 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, disable_sysinfo=True,
-                 dev_mode=True, tag="dev")
+                 use_faft=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 fe0c94e..efde720 100644
--- a/server/site_tests/firmware_DevFwNormalBoot/control
+++ b/server/site_tests/firmware_DevFwNormalBoot/control
@@ -28,7 +28,6 @@
 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, disable_sysinfo=True,
-                 dev_mode=True, tag="dev")
+                 use_faft=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 22dc3fd..182f6be 100644
--- a/server/site_tests/firmware_DevMode/control
+++ b/server/site_tests/firmware_DevMode/control
@@ -24,7 +24,6 @@
 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, disable_sysinfo=True,
-                 dev_mode=False, tag="normal")
+                 use_faft=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 1b3e5f3..9922ff9 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, disable_sysinfo=True, dev_mode=True, tag="dev")
+                 use_faft=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 8fcde44..edc3101 100644
--- a/server/site_tests/firmware_DevScreenTimeout/control
+++ b/server/site_tests/firmware_DevScreenTimeout/control
@@ -32,7 +32,6 @@
 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, disable_sysinfo=True,
-                 dev_mode=True, tag="dev")
+                 use_faft=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 c723c8a..886a990 100644
--- a/server/site_tests/firmware_DevTriggerRecovery/control
+++ b/server/site_tests/firmware_DevTriggerRecovery/control
@@ -27,7 +27,6 @@
 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, disable_sysinfo=True,
-                 dev_mode=False, tag="normal")
+                 use_faft=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 1c627f7..1d2af0d 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, disable_sysinfo=True)
+                 use_faft=True)
 
 parallel_simple(run_ecadc, machines)
diff --git a/server/site_tests/firmware_ECBattery/control b/server/site_tests/firmware_ECBattery/control
index 85dd619..6aa596c 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, disable_sysinfo=True)
+                 use_faft=True)
 
 parallel_simple(run_ecbattery, machines)
diff --git a/server/site_tests/firmware_ECBootTime/control b/server/site_tests/firmware_ECBootTime/control
index 4457fc2..084df1a 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, disable_sysinfo=True)
+                 use_faft=True)
 
 parallel_simple(run_ecboottime, machines)
diff --git a/server/site_tests/firmware_ECCharging/control b/server/site_tests/firmware_ECCharging/control
index da0676c..282a8c7 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, disable_sysinfo=True)
+                 use_faft=True)
 
 parallel_simple(run_eccharging, machines)
diff --git a/server/site_tests/firmware_ECKeyboard/control b/server/site_tests/firmware_ECKeyboard/control
index f15b394..5ff4fcf 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, disable_sysinfo=True)
+                 use_faft=True)
 
 parallel_simple(run_eckeyboard, machines)
diff --git a/server/site_tests/firmware_ECLidSwitch/control b/server/site_tests/firmware_ECLidSwitch/control
index 33fee4d..2103bfd 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, disable_sysinfo=True)
+                 use_faft=True)
 
 parallel_simple(run_eclidswitch, machines)
diff --git a/server/site_tests/firmware_ECPeci/control b/server/site_tests/firmware_ECPeci/control
index 2cb0d01..ec8c06e 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, disable_sysinfo=True)
+                 use_faft=True)
 
 parallel_simple(run_ecpeci, machines)
diff --git a/server/site_tests/firmware_ECPowerButton/control b/server/site_tests/firmware_ECPowerButton/control
index 178020b..38bcc02 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, disable_sysinfo=True)
+                 use_faft=True)
 
 parallel_simple(run_ecpowerbutton, machines)
diff --git a/server/site_tests/firmware_ECPowerG3/control b/server/site_tests/firmware_ECPowerG3/control
index a3d1b49..164a1a3 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, disable_sysinfo=True)
+                 use_faft=True)
 
 parallel_simple(run_ecpowerg3, machines)
diff --git a/server/site_tests/firmware_ECSharedMem/control b/server/site_tests/firmware_ECSharedMem/control
index d3a075f..894b090 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, disable_sysinfo=True)
+                 use_faft=True)
 
 parallel_simple(run_ecsharedmem, machines)
diff --git a/server/site_tests/firmware_ECThermal/control b/server/site_tests/firmware_ECThermal/control
index 7365066..d48ef76 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, disable_sysinfo=True)
+                 use_faft=True)
 
 parallel_simple(run_ecthermal, machines)
diff --git a/server/site_tests/firmware_ECUsbPorts/control b/server/site_tests/firmware_ECUsbPorts/control
index 0a22508..106d7f0 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, disable_sysinfo=True)
+                 use_faft=True)
 
 parallel_simple(run_ecusbports, machines)
diff --git a/server/site_tests/firmware_ECWakeSource/control b/server/site_tests/firmware_ECWakeSource/control
index e9c1d06..b21b188 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, disable_sysinfo=True)
+                 use_faft=True)
 
 parallel_simple(run_ecwakesource, machines)
diff --git a/server/site_tests/firmware_ECWatchdog/control b/server/site_tests/firmware_ECWatchdog/control
index a3b62a0..27d9ec1 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, disable_sysinfo=True)
+                 use_faft=True)
 
 parallel_simple(run_ecwatchdog, machines)
diff --git a/server/site_tests/firmware_ECWriteProtect/control b/server/site_tests/firmware_ECWriteProtect/control
index df6f8aa..01a113e 100644
--- a/server/site_tests/firmware_ECWriteProtect/control
+++ b/server/site_tests/firmware_ECWriteProtect/control
@@ -36,7 +36,6 @@
 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, disable_sysinfo=True,
-                 dev_mode=False, tag="normal")
+                 use_faft=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 4f1866c..441615d 100644
--- a/server/site_tests/firmware_ECWriteProtect/control.dev
+++ b/server/site_tests/firmware_ECWriteProtect/control.dev
@@ -35,7 +35,6 @@
 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, disable_sysinfo=True,
-                 dev_mode=True, tag="dev")
+                 use_faft=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 d9b0669..09f1d11 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, disable_sysinfo=True)
+                 use_faft=True)
 
 parallel_simple(run_faftsetup, machines)
diff --git a/server/site_tests/firmware_FwScreenCloseLid/control b/server/site_tests/firmware_FwScreenCloseLid/control
index f209bfa..acee65f 100644
--- a/server/site_tests/firmware_FwScreenCloseLid/control
+++ b/server/site_tests/firmware_FwScreenCloseLid/control
@@ -27,7 +27,6 @@
 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, disable_sysinfo=True,
-                 dev_mode=True, tag="dev")
+                 use_faft=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 8e3f00b..af1dd5f 100644
--- a/server/site_tests/firmware_FwScreenPressPower/control
+++ b/server/site_tests/firmware_FwScreenPressPower/control
@@ -27,7 +27,6 @@
 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, disable_sysinfo=True,
-                 dev_mode=True, tag="dev")
+                 use_faft=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 3170210..566f883 100644
--- a/server/site_tests/firmware_InvalidUSB/control
+++ b/server/site_tests/firmware_InvalidUSB/control
@@ -27,7 +27,6 @@
 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, disable_sysinfo=True,
-                 dev_mode=False, tag="normal")
+                 use_faft=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 db7e886..92b325d 100644
--- a/server/site_tests/firmware_RONormalBoot/control
+++ b/server/site_tests/firmware_RONormalBoot/control
@@ -24,7 +24,6 @@
 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, disable_sysinfo=True,
-                 dev_mode=False, tag="normal")
+                 use_faft=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 9bea459..3b47167 100644
--- a/server/site_tests/firmware_RONormalBoot/control.dev
+++ b/server/site_tests/firmware_RONormalBoot/control.dev
@@ -24,7 +24,6 @@
 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, disable_sysinfo=True,
-                 dev_mode=True, tag="dev")
+                 use_faft=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 b12e9c3..a6e06d4 100644
--- a/server/site_tests/firmware_RecoveryButton/control
+++ b/server/site_tests/firmware_RecoveryButton/control
@@ -27,7 +27,6 @@
 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, disable_sysinfo=True,
-                 dev_mode=False, tag="normal")
+                 use_faft=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 450a1ef..e7f2590 100644
--- a/server/site_tests/firmware_RecoveryButton/control.dev
+++ b/server/site_tests/firmware_RecoveryButton/control.dev
@@ -27,7 +27,6 @@
 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, disable_sysinfo=True,
-                 dev_mode=True, tag="dev")
+                 use_faft=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 15f0eca..3a04309 100644
--- a/server/site_tests/firmware_RollbackFirmware/control
+++ b/server/site_tests/firmware_RollbackFirmware/control
@@ -27,7 +27,6 @@
 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, disable_sysinfo=True,
-                 dev_mode=False, tag="normal")
+                 use_faft=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 cc7b022..69e0944 100644
--- a/server/site_tests/firmware_RollbackFirmware/control.dev
+++ b/server/site_tests/firmware_RollbackFirmware/control.dev
@@ -27,7 +27,6 @@
 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, disable_sysinfo=True,
-                 dev_mode=True, tag="dev")
+                 use_faft=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 9260326..073dd5a 100644
--- a/server/site_tests/firmware_RollbackKernel/control
+++ b/server/site_tests/firmware_RollbackKernel/control
@@ -28,7 +28,6 @@
 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, disable_sysinfo=True,
-                 dev_mode=False, tag="normal")
+                 use_faft=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 d55fe29..7fe9dda 100644
--- a/server/site_tests/firmware_RollbackKernel/control.dev
+++ b/server/site_tests/firmware_RollbackKernel/control.dev
@@ -28,7 +28,6 @@
 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, disable_sysinfo=True,
-                 dev_mode=True, tag="dev")
+                 use_faft=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 996637b..92b777a 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, disable_sysinfo=True)
+                 use_faft=True)
 
 parallel_simple(run_shellball, machines)
diff --git a/server/site_tests/firmware_SoftwareSync/control b/server/site_tests/firmware_SoftwareSync/control
index 729f99d..a9df477 100644
--- a/server/site_tests/firmware_SoftwareSync/control
+++ b/server/site_tests/firmware_SoftwareSync/control
@@ -24,7 +24,6 @@
 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, disable_sysinfo=True,
-                 dev_mode=False, tag="normal")
+                 use_faft=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 a77b26a..16c4875 100644
--- a/server/site_tests/firmware_SoftwareSync/control.dev
+++ b/server/site_tests/firmware_SoftwareSync/control.dev
@@ -23,7 +23,6 @@
 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, disable_sysinfo=True,
-                 dev_mode=True, tag="dev")
+                 use_faft=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 18c1404..fbf800c 100644
--- a/server/site_tests/firmware_TryFwB/control
+++ b/server/site_tests/firmware_TryFwB/control
@@ -24,7 +24,6 @@
 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, disable_sysinfo=True,
-                 dev_mode=False, tag="normal")
+                 use_faft=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 934b802..99526e1 100644
--- a/server/site_tests/firmware_TryFwB/control.dev
+++ b/server/site_tests/firmware_TryFwB/control.dev
@@ -24,7 +24,6 @@
 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, disable_sysinfo=True,
-                 dev_mode=True, tag="dev")
+                 use_faft=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 6c87fae..184249e 100644
--- a/server/site_tests/firmware_UpdateECBin/control
+++ b/server/site_tests/firmware_UpdateECBin/control
@@ -55,7 +55,6 @@
 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, disable_sysinfo=True,
-                 dev_mode=False, tag="normal")
+                 use_faft=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 3cdf8e2..26609a1 100644
--- a/server/site_tests/firmware_UpdateECBin/control.dev
+++ b/server/site_tests/firmware_UpdateECBin/control.dev
@@ -55,7 +55,6 @@
 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, disable_sysinfo=True,
-                 dev_mode=True, tag="dev")
+                 use_faft=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 b3d6352..7bef076 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, disable_sysinfo=True)
+                 use_faft=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 1f633aa..e5eecf8 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, disable_sysinfo=True)
+                 use_faft=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 be9fea5..2d9d8fa 100644
--- a/server/site_tests/firmware_UpdateKernelDataKeyVersion/control
+++ b/server/site_tests/firmware_UpdateKernelDataKeyVersion/control
@@ -37,7 +37,6 @@
 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, disable_sysinfo=True,
-                 dev_mode=True, tag="dev")
+                 cmdline_args=args, use_faft=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 226874e..893292b 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, disable_sysinfo=True)
+                 use_faft=True)
 
 parallel_simple(run_updatekernelsubkeyversion, machines)
diff --git a/server/site_tests/firmware_UpdateKernelVersion/control b/server/site_tests/firmware_UpdateKernelVersion/control
index 009e7fe..e18c646 100644
--- a/server/site_tests/firmware_UpdateKernelVersion/control
+++ b/server/site_tests/firmware_UpdateKernelVersion/control
@@ -35,7 +35,6 @@
 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, disable_sysinfo=True,
-                 dev_mode=True, tag="dev")
+                 use_faft=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 a9d05ae..98b70eb 100644
--- a/server/site_tests/firmware_UserRequestRecovery/control
+++ b/server/site_tests/firmware_UserRequestRecovery/control
@@ -28,7 +28,6 @@
 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, disable_sysinfo=True,
-                 dev_mode=False, tag="normal")
+                 use_faft=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 c1c9fc7..2f42251 100644
--- a/server/site_tests/firmware_UserRequestRecovery/control.dev
+++ b/server/site_tests/firmware_UserRequestRecovery/control.dev
@@ -28,7 +28,6 @@
 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, disable_sysinfo=True,
-                 dev_mode=True, tag="dev")
+                 use_faft=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 dc8afad..282e700 100644
--- a/server/site_tests/suites/control.faft_bios
+++ b/server/site_tests/suites/control.faft_bios
@@ -58,13 +58,9 @@
     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, disable_sysinfo=True,
-                     dev_mode=False, tag="normal",
-                     **argv)
+                     use_faft=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, disable_sysinfo=True,
-                     dev_mode=True, tag="dev",
-                     **argv)
+                     use_faft=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 82834af..33e6f3a 100644
--- a/server/site_tests/suites/control.faft_lv1
+++ b/server/site_tests/suites/control.faft_lv1
@@ -44,13 +44,9 @@
     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, disable_sysinfo=True,
-                     dev_mode=False, tag="normal",
-                     **argv)
+                     use_faft=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, disable_sysinfo=True,
-                     dev_mode=True, tag="dev",
-                     **argv)
+                     use_faft=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 8cc33e2..b8ce867 100644
--- a/server/site_tests/suites/control.faft_lv2
+++ b/server/site_tests/suites/control.faft_lv2
@@ -48,13 +48,9 @@
     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, disable_sysinfo=True,
-                     dev_mode=False, tag="normal",
-                     **argv)
+                     use_faft=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, disable_sysinfo=True,
-                     dev_mode=True, tag="dev",
-                     **argv)
+                     use_faft=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 4c6db60..8db022b 100644
--- a/server/site_tests/suites/control.faft_lv3
+++ b/server/site_tests/suites/control.faft_lv3
@@ -54,13 +54,9 @@
     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, disable_sysinfo=True,
-                     dev_mode=False, tag="normal",
-                     **argv)
+                     use_faft=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, disable_sysinfo=True,
-                     dev_mode=True, tag="dev",
-                     **argv)
+                     use_faft=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 aae6b86..f52c4bd 100644
--- a/server/site_tests/suites/control.faft_lv4
+++ b/server/site_tests/suites/control.faft_lv4
@@ -47,13 +47,9 @@
     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, disable_sysinfo=True,
-                     dev_mode=False, tag="normal",
-                     **argv)
+                     use_faft=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, disable_sysinfo=True,
-                     dev_mode=True, tag="dev",
-                     **argv)
+                     use_faft=True, dev_mode=True, tag="dev", **argv)
 
 parallel_simple(run_server_test, machines)