diff --git a/client/common_lib/cros/fake_device_server/commands.py b/client/common_lib/cros/fake_device_server/commands.py
index b6c4e9c..d23aa9c 100755
--- a/client/common_lib/cros/fake_device_server/commands.py
+++ b/client/common_lib/cros/fake_device_server/commands.py
@@ -8,10 +8,10 @@
 import logging
 
 import common
-from cros_lib.fake_device_server import common_util
-from cros_lib.fake_device_server import constants
-from cros_lib.fake_device_server import resource_method
-from cros_lib.fake_device_server import server_errors
+from fake_device_server import common_util
+from fake_device_server import constants
+from fake_device_server import resource_method
+from fake_device_server import server_errors
 
 
 # TODO(sosa) Support upload method (and mediaPath parameter).
diff --git a/client/common_lib/cros/fake_device_server/commands_unittest.py b/client/common_lib/cros/fake_device_server/commands_unittest.py
index d456845..11599bb 100755
--- a/client/common_lib/cros/fake_device_server/commands_unittest.py
+++ b/client/common_lib/cros/fake_device_server/commands_unittest.py
@@ -10,9 +10,9 @@
 import unittest
 
 import common
-from cros_lib.fake_device_server import commands
-from cros_lib.fake_device_server import resource_delegate
-from cros_lib.fake_device_server import server_errors
+from fake_device_server import commands
+from fake_device_server import resource_delegate
+from fake_device_server import server_errors
 
 
 class CommandsTest(mox.MoxTestBase):
diff --git a/client/common_lib/cros/fake_device_server/common.py b/client/common_lib/cros/fake_device_server/common.py
index ddadac1..65b3059 100644
--- a/client/common_lib/cros/fake_device_server/common.py
+++ b/client/common_lib/cros/fake_device_server/common.py
@@ -2,16 +2,9 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-"""Autotest common with additional cros_lib helper (for parent directory)."""
+"""Common to set up import path."""
 
 import os, sys
 dirname = os.path.dirname(sys.modules[__name__].__file__)
-client_dir = os.path.abspath(os.path.join(dirname, "..", "..", ".."))
 cros_dir = os.path.abspath(os.path.join(dirname, ".."))
-sys.path.insert(0, client_dir)
-import setup_modules
-sys.path.pop(0)
-setup_modules.setup(base_path=client_dir,
-                    root_module_name="autotest_lib.client")
-setup_modules.setup(base_path=cros_dir,
-                    root_module_name="cros_lib")
+sys.path.insert(0, cros_dir)
diff --git a/client/common_lib/cros/fake_device_server/common_util.py b/client/common_lib/cros/fake_device_server/common_util.py
index 31fea23..49df039 100755
--- a/client/common_lib/cros/fake_device_server/common_util.py
+++ b/client/common_lib/cros/fake_device_server/common_util.py
@@ -8,7 +8,7 @@
 import json
 
 import common
-from cros_lib.fake_device_server import server_errors
+from fake_device_server import server_errors
 
 
 def parse_serialized_json():
diff --git a/client/common_lib/cros/fake_device_server/common_util_unittest.py b/client/common_lib/cros/fake_device_server/common_util_unittest.py
index ac5ff1d..d1761e9 100755
--- a/client/common_lib/cros/fake_device_server/common_util_unittest.py
+++ b/client/common_lib/cros/fake_device_server/common_util_unittest.py
@@ -12,8 +12,8 @@
 import unittest
 
 import common
-from cros_lib.fake_device_server import common_util
-from cros_lib.fake_device_server import server_errors
+from fake_device_server import common_util
+from fake_device_server import server_errors
 
 
 class FakeDeviceServerTests(unittest.TestCase):
diff --git a/client/common_lib/cros/fake_device_server/devices.py b/client/common_lib/cros/fake_device_server/devices.py
index 1e7c3e6..43cdd61 100755
--- a/client/common_lib/cros/fake_device_server/devices.py
+++ b/client/common_lib/cros/fake_device_server/devices.py
@@ -7,9 +7,9 @@
 from cherrypy import tools
 
 import common
-from cros_lib.fake_device_server import common_util
-from cros_lib.fake_device_server import resource_method
-from cros_lib.fake_device_server import server_errors
+from fake_device_server import common_util
+from fake_device_server import resource_method
+from fake_device_server import server_errors
 
 
 # TODO(sosa): All access to this object should technically require auth. Create
diff --git a/client/common_lib/cros/fake_device_server/devices_unittest.py b/client/common_lib/cros/fake_device_server/devices_unittest.py
index 66a65bf..0b08762 100755
--- a/client/common_lib/cros/fake_device_server/devices_unittest.py
+++ b/client/common_lib/cros/fake_device_server/devices_unittest.py
@@ -10,10 +10,10 @@
 import unittest
 
 import common
-from cros_lib.fake_device_server import commands
-from cros_lib.fake_device_server import devices
-from cros_lib.fake_device_server import resource_delegate
-from cros_lib.fake_device_server import server_errors
+from fake_device_server import commands
+from fake_device_server import devices
+from fake_device_server import resource_delegate
+from fake_device_server import server_errors
 
 
 class DevicesTest(mox.MoxTestBase):
diff --git a/client/common_lib/cros/fake_device_server/registration_tickets.py b/client/common_lib/cros/fake_device_server/registration_tickets.py
index 8d2744a..1716d4a 100755
--- a/client/common_lib/cros/fake_device_server/registration_tickets.py
+++ b/client/common_lib/cros/fake_device_server/registration_tickets.py
@@ -10,8 +10,8 @@
 import uuid
 
 import common
-from cros_lib.fake_device_server import common_util
-from cros_lib.fake_device_server import server_errors
+from fake_device_server import common_util
+from fake_device_server import server_errors
 
 
 class RegistrationTickets(object):
diff --git a/client/common_lib/cros/fake_device_server/registration_tickets_unittest.py b/client/common_lib/cros/fake_device_server/registration_tickets_unittest.py
index 0016f97..be76560 100755
--- a/client/common_lib/cros/fake_device_server/registration_tickets_unittest.py
+++ b/client/common_lib/cros/fake_device_server/registration_tickets_unittest.py
@@ -10,12 +10,12 @@
 import unittest
 
 import common
-from cros_lib.fake_device_server import common_util
-from cros_lib.fake_device_server import commands
-from cros_lib.fake_device_server import devices
-from cros_lib.fake_device_server import registration_tickets
-from cros_lib.fake_device_server import resource_delegate
-from cros_lib.fake_device_server import server_errors
+from fake_device_server import common_util
+from fake_device_server import commands
+from fake_device_server import devices
+from fake_device_server import registration_tickets
+from fake_device_server import resource_delegate
+from fake_device_server import server_errors
 
 
 class RegistrationTicketsTest(mox.MoxTestBase):
diff --git a/client/common_lib/cros/fake_device_server/resource_delegate.py b/client/common_lib/cros/fake_device_server/resource_delegate.py
index cb51655..c95e824 100755
--- a/client/common_lib/cros/fake_device_server/resource_delegate.py
+++ b/client/common_lib/cros/fake_device_server/resource_delegate.py
@@ -8,7 +8,7 @@
 import uuid
 
 import common
-from cros_lib.fake_device_server import server_errors
+from fake_device_server import server_errors
 
 
 class ResourceDelegate(object):
diff --git a/client/common_lib/cros/fake_device_server/resource_method.py b/client/common_lib/cros/fake_device_server/resource_method.py
index f42a85d..58257c3 100755
--- a/client/common_lib/cros/fake_device_server/resource_method.py
+++ b/client/common_lib/cros/fake_device_server/resource_method.py
@@ -7,8 +7,8 @@
 from cherrypy import tools
 
 import common
-from cros_lib.fake_device_server import common_util
-from cros_lib.fake_device_server import server_errors
+from fake_device_server import common_util
+from fake_device_server import server_errors
 
 
 class ResourceMethod(object):
diff --git a/client/common_lib/cros/fake_device_server/resource_method_unittest.py b/client/common_lib/cros/fake_device_server/resource_method_unittest.py
index 1700a03..983ee62 100755
--- a/client/common_lib/cros/fake_device_server/resource_method_unittest.py
+++ b/client/common_lib/cros/fake_device_server/resource_method_unittest.py
@@ -10,10 +10,10 @@
 import unittest
 
 import common
-from cros_lib.fake_device_server import common_util
-from cros_lib.fake_device_server import resource_method
-from cros_lib.fake_device_server import resource_delegate
-from cros_lib.fake_device_server import server_errors
+from fake_device_server import common_util
+from fake_device_server import resource_method
+from fake_device_server import resource_delegate
+from fake_device_server import server_errors
 
 
 class ResourceMethodTest(mox.MoxTestBase):
diff --git a/client/common_lib/cros/fake_device_server/server.py b/client/common_lib/cros/fake_device_server/server.py
index 8fc8653..9b4f190 100755
--- a/client/common_lib/cros/fake_device_server/server.py
+++ b/client/common_lib/cros/fake_device_server/server.py
@@ -13,10 +13,10 @@
 import cherrypy
 
 import common
-from cros_lib.fake_device_server import commands
-from cros_lib.fake_device_server import devices
-from cros_lib.fake_device_server import registration_tickets
-from cros_lib.fake_device_server import resource_delegate
+from fake_device_server import commands
+from fake_device_server import devices
+from fake_device_server import registration_tickets
+from fake_device_server import resource_delegate
 
 
 def stop_server():