Merge remote branch 'cros/upstream' into tempbranch

BUG=
TEST=

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

Change-Id: I5d56f1c10d0fce7f9d7dc3ad727ea52dcb9b2d6c
diff --git a/client/tests/kvm/get_started.py b/client/tests/kvm/get_started.py
index 00b5f6b..6fa6b5f 100755
--- a/client/tests/kvm/get_started.py
+++ b/client/tests/kvm/get_started.py
@@ -68,8 +68,8 @@
                  "config samples to actual config files)")
     kvm_test_dir = os.path.dirname(sys.modules[__name__].__file__)
     kvm_test_dir = os.path.abspath(kvm_test_dir)
-    config_file_list = ["address_pools.cfg", "build.cfg", "cdkeys.cfg",
-                        "tests_base.cfg", "tests.cfg", "unittests.cfg"]
+    config_file_list = ["build.cfg", "cdkeys.cfg", "tests_base.cfg",
+                        "tests.cfg", "unittests.cfg"]
     for config_file in config_file_list:
         src_file = os.path.join(kvm_test_dir, "%s.sample" % config_file)
         dst_file = os.path.join(kvm_test_dir, config_file)