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

Merged to upstream trunk@5066, from trunk@4749.

There is no way I could enlist each individual CL from the upstream here since it will blow up the changelist description field.

BUG=
TEST=
Had patched this CL into a fresh cut client to avoid any side effect.
run_remote_test bvt from both emerged location and third_party/autotest/file.

Both test passed!

We should also keep any eye on this to see how it gets propagated into cautotest server.
TBR=dalecurtis

Change-Id: I72f2bc7a9de530178484aea1bfb5ace68bcad029
diff --git a/utils/test_importer.py b/utils/test_importer.py
index 00b912c..6a63b1e 100755
--- a/utils/test_importer.py
+++ b/utils/test_importer.py
@@ -241,6 +241,12 @@
 
         _log_or_execute(repr(new_test), new_test.save)
         add_label_dependencies(new_test)
+        
+        # save TestParameter
+        for para_name in data.test_parameters:
+          test_parameter = models.TestParameter.objects.get_or_create(
+              test=new_test, name=para_name)[0]
+          test_parameter.save()
 
 
 def _set_attributes_clean(test, data):