| Index: build/android/pylib/device/device_utils.py | 
| diff --git a/build/android/pylib/device/device_utils.py b/build/android/pylib/device/device_utils.py | 
| index ae28cd52318dfd594aa10b0dcff5a4ae71523aea..bc1f2ab27339c25b18d03ccac517649c15017c55 100644 | 
| --- a/build/android/pylib/device/device_utils.py | 
| +++ b/build/android/pylib/device/device_utils.py | 
| @@ -23,7 +23,6 @@ import threading | 
| import time | 
| import zipfile | 
|  | 
| -import pylib.android_commands | 
| from pylib import cmd_helper | 
| from pylib import constants | 
| from pylib import device_signal | 
| @@ -174,16 +173,10 @@ class DeviceUtils(object): | 
| value is provided. | 
| """ | 
| self.adb = None | 
| -    self.old_interface = None | 
| if isinstance(device, basestring): | 
| self.adb = adb_wrapper.AdbWrapper(device) | 
| -      self.old_interface = pylib.android_commands.AndroidCommands(device) | 
| elif isinstance(device, adb_wrapper.AdbWrapper): | 
| self.adb = device | 
| -      self.old_interface = pylib.android_commands.AndroidCommands(str(device)) | 
| -    elif isinstance(device, pylib.android_commands.AndroidCommands): | 
| -      self.adb = adb_wrapper.AdbWrapper(device.GetDevice()) | 
| -      self.old_interface = device | 
| else: | 
| raise ValueError('Unsupported device value: %r' % device) | 
| self._commands_installed = None | 
|  |