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

utils/site_test_importer_attributes.py

Index: utils/site_test_importer_attributes.py
diff --git a/utils/site_test_importer_attributes.py b/utils/site_test_importer_attributes.py
index a2a1b509d962deecda1ac1ef8aba6b3cea498a2b..f49aedb4dda4e94e6b346fed65a6c4428d03bad6 100755
--- a/utils/site_test_importer_attributes.py
+++ b/utils/site_test_importer_attributes.py
@@ -8,6 +8,7 @@ This allows a site to customize the test creation attributes.
 
 
 import common, re
+from autotest_lib.frontend.afe import models
 
 
 def _set_attributes_custom(test, data):
@@ -23,3 +24,9 @@ def _set_attributes_custom(test, data):
 
     # 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()