Revert "Merge remote branch 'cros/upstream' into autotest-rebase"

This reverts commit 7edb30498d75a29a3287fe07070f2b51a116c5d4.

TEST=Built for tegra2_seaboard
BUG=10756

Review URL: http://codereview.chromium.org/6124004

Change-Id: Ifcd1a2279f5a62b99552a8f961c1430889a3a928
diff --git a/utils/site_test_importer_attributes.py b/utils/site_test_importer_attributes.py
index a2a1b50..f49aedb 100755
--- a/utils/site_test_importer_attributes.py
+++ b/utils/site_test_importer_attributes.py
@@ -8,6 +8,7 @@
 
 
 import common, re
+from autotest_lib.frontend.afe import models
 
 
 def _set_attributes_custom(test, data):
@@ -23,3 +24,9 @@
 
     # We set verify to always False (0).
     test.run_verify = 0
+    
+    if hasattr(data, 'test_parameters'):
+        for para_name in data.test_parameters:
+            test_parameter = models.TestParameter.objects.get_or_create(
+                test=test, name=para_name)[0]
+            test_parameter.save()