Revert of [Telemetry] Reenable unused-import lint check for telemetry. (patchset #1 id:40001 of https://codereview.chromium.org/1051323006/)

Reason for revert:
Failing telemetery_unittests on Linux Tests bot:

https://sheriff-o-matic.appspot.com/chromium/failure/telemetry_unittests%3A%3ALinux%20Tests

Original issue's description:
> [Telemetry] Reenable unused-import lint check for telemetry.
>
> Fix all the places that have unused-import in telemetry.
>
> BUG=475714
>
> Committed: https://crrev.com/dced4517e3fe208cd5d02ee361b43132afec870d
> Cr-Commit-Position: refs/heads/master@{#326298}

TBR=sullivan@chromium.org,dtu@chromium.org,nednguyen@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=475714

Review URL: https://codereview.chromium.org/1060063007

Cr-Commit-Position: refs/heads/master@{#326314}

54 files changed, 111 insertions, 24 deletions

diff --git a/tools/telemetry/pylintrc b/tools/telemetry/pylintrc
index 1107774..b112c52 100644
--- a/tools/telemetry/pylintrc
+++ b/tools/telemetry/pylintrc
@@ -1,8 +1,8 @@
 [MESSAGES CONTROL]
 
 # Disable the message, report, category or checker with the given id(s).
-# # TODO(nednguyen): Remove unusued-argument from this list.
-disable=I0010,I0011,abstract-class-little-used,abstract-class-not-used,anomalous-backslash-in-string,bad-builtin,bad-context-manager,bad-continuation,bad-indentation,bad-str-strip-call,bad-whitespace,broad-except,cell-var-from-loop,deprecated-lambda,deprecated-module,duplicate-code,eval-used,exec-used,fixme,function-redefined,global-statement,interface-not-implemented,invalid-name,locally-enabled,logging-not-lazy,missing-docstring,missing-final-newline,no-init,no-member,no-name-in-module,no-self-use,no-self-use,not-callable,old-style-class,protected-access,reimported,star-args,super-on-old-class,superfluous-parens,too-few-public-methods,too-many-ancestors,too-many-arguments,too-many-branches,too-many-function-args,too-many-instance-attributes,too-many-lines,too-many-locals,too-many-public-methods,too-many-return-statements,too-many-statements,unnecessary-semicolon,unpacking-non-sequence,cyclic-import, unused-argument
+# TODO(nednguyen): Remove unusued-argument and unused-import from this list.
+disable=I0010,I0011,abstract-class-little-used,abstract-class-not-used,anomalous-backslash-in-string,bad-builtin,bad-context-manager,bad-continuation,bad-indentation,bad-str-strip-call,bad-whitespace,broad-except,cell-var-from-loop,deprecated-lambda,deprecated-module,duplicate-code,eval-used,exec-used,fixme,function-redefined,global-statement,import-error,interface-not-implemented,invalid-name,locally-enabled,logging-not-lazy,missing-docstring,missing-final-newline,no-init,no-member,no-name-in-module,no-self-use,no-self-use,not-callable,old-style-class,protected-access,reimported,star-args,super-on-old-class,superfluous-parens,too-few-public-methods,too-many-ancestors,too-many-arguments,too-many-branches,too-many-function-args,too-many-instance-attributes,too-many-lines,too-many-locals,too-many-public-methods,too-many-return-statements,too-many-statements,trailing-whitespace,unnecessary-semicolon,unpacking-non-sequence,useless-else-on-loop,unused-argument,unused-import
 
 
 [REPORTS]
diff --git a/tools/telemetry/telemetry/benchmark_runner.py b/tools/telemetry/telemetry/benchmark_runner.py
index cfe8e87..1113f33 100644
--- a/tools/telemetry/telemetry/benchmark_runner.py
+++ b/tools/telemetry/telemetry/benchmark_runner.py
@@ -18,7 +18,9 @@ from telemetry.core import browser_finder
 from telemetry.core import browser_options
 from telemetry.core import command_line
 from telemetry.core import discover
+from telemetry.core import util
 from telemetry import decorators
+from telemetry.util import find_dependencies
 
 
 class Environment(object):
diff --git a/tools/telemetry/telemetry/benchmark_unittest.py b/tools/telemetry/telemetry/benchmark_unittest.py
index 488706f..3917d8b 100644
--- a/tools/telemetry/telemetry/benchmark_unittest.py
+++ b/tools/telemetry/telemetry/benchmark_unittest.py
@@ -60,7 +60,7 @@ class BenchmarkTest(unittest.TestCase):
   def testPageTestWithCompatibleUserStory(self):
     original_run_fn = user_story_runner.Run
     was_run = [False]
-    def RunStub(*_arg, **_kwargs):
+    def RunStub(*_, **__):
       was_run[0] = True
     user_story_runner.Run = RunStub
 
diff --git a/tools/telemetry/telemetry/core/_bitmap.py b/tools/telemetry/telemetry/core/_bitmap.py
index 808e939..89aedfc 100644
--- a/tools/telemetry/telemetry/core/_bitmap.py
+++ b/tools/telemetry/telemetry/core/_bitmap.py
@@ -8,6 +8,7 @@ tools: crop, find bounding box of a color and compute histogram of color values.
 """
 
 import array
+import base64
 import cStringIO
 import struct
 import subprocess
diff --git a/tools/telemetry/telemetry/core/android_app_unittest.py b/tools/telemetry/telemetry/core/android_app_unittest.py
index fa38386..91a5a0d 100644
--- a/tools/telemetry/telemetry/core/android_app_unittest.py
+++ b/tools/telemetry/telemetry/core/android_app_unittest.py
@@ -6,16 +6,13 @@ import logging
 import time
 import unittest
 
+from pylib.device import intent
 from telemetry.core import android_app
 from telemetry.core.backends import android_app_backend
 from telemetry.core import platform as platform_module
 from telemetry.core.platform import android_device
-from telemetry.core import util
 from telemetry.unittest_util import options_for_unittests
 
-util.AddDirToPythonPath(util.GetChromiumSrcDir(), 'build', 'android')
-from pylib.device import intent  # pylint: disable=import-error
-
 
 class AndroidAppTest(unittest.TestCase):
   def setUp(self):
diff --git a/tools/telemetry/telemetry/core/backends/android_app_backend.py b/tools/telemetry/telemetry/core/backends/android_app_backend.py
index b2c56f2..d218657 100644
--- a/tools/telemetry/telemetry/core/backends/android_app_backend.py
+++ b/tools/telemetry/telemetry/core/backends/android_app_backend.py
@@ -3,12 +3,15 @@
 # found in the LICENSE file.
 
 import re
+import time
 
 from telemetry.core import android_process
+from telemetry.core.backends import adb_commands
 from telemetry.core.backends import android_browser_backend_settings
 from telemetry.core.backends import android_command_line_backend
 from telemetry.core.backends import app_backend
 from telemetry.core import util
+from telemetry.core import web_contents
 
 
 class AndroidAppBackend(app_backend.AppBackend):
diff --git a/tools/telemetry/telemetry/core/backends/android_command_line_backend_unittest.py b/tools/telemetry/telemetry/core/backends/android_command_line_backend_unittest.py
index da57d09..b5e70f1 100644
--- a/tools/telemetry/telemetry/core/backends/android_command_line_backend_unittest.py
+++ b/tools/telemetry/telemetry/core/backends/android_command_line_backend_unittest.py
@@ -2,6 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import logging
 import unittest
 
 from telemetry import benchmark
@@ -15,7 +16,7 @@ class _MockBackendSettings(object):
   def __init__(self, path):
     self._path = path
 
-  def GetCommandLineFile(self, _):
+  def GetCommandLineFile(self, _is_user_debug_build):
     return self._path
 
 
diff --git a/tools/telemetry/telemetry/core/backends/chrome/android_browser_backend.py b/tools/telemetry/telemetry/core/backends/chrome/android_browser_backend.py
index 0a4de84..c3f1560 100644
--- a/tools/telemetry/telemetry/core/backends/chrome/android_browser_backend.py
+++ b/tools/telemetry/telemetry/core/backends/chrome/android_browser_backend.py
@@ -3,7 +3,9 @@
 # found in the LICENSE file.
 
 import logging
+import pipes
 import sys
+import time
 
 from telemetry.core.backends import adb_commands
 from telemetry.core.backends import android_command_line_backend
@@ -16,6 +18,7 @@ from telemetry.core.platform import android_platform_backend as \
 from telemetry.core import util
 
 util.AddDirToPythonPath(util.GetChromiumSrcDir(), 'build', 'android')
+from pylib.device import device_errors  # pylint: disable=F0401
 from pylib.device import intent  # pylint: disable=F0401
 
 
diff --git a/tools/telemetry/telemetry/core/backends/chrome/chrome_browser_backend.py b/tools/telemetry/telemetry/core/backends/chrome/chrome_browser_backend.py
index c46fdd30..c7d29a6 100644
--- a/tools/telemetry/telemetry/core/backends/chrome/chrome_browser_backend.py
+++ b/tools/telemetry/telemetry/core/backends/chrome/chrome_browser_backend.py
@@ -2,16 +2,22 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import contextlib
+import httplib
+import json
 import logging
 import pprint
 import re
+import socket
 import sys
+import urllib2
 
 from telemetry.core.backends import browser_backend
 from telemetry.core.backends.chrome import extension_backend
 from telemetry.core.backends.chrome import system_info_backend
 from telemetry.core.backends.chrome import tab_list_backend
 from telemetry.core.backends.chrome_inspector import devtools_client_backend
+from telemetry.core.backends.chrome_inspector import devtools_http
 from telemetry.core import exceptions
 from telemetry.core import forwarders
 from telemetry.core import user_agent
diff --git a/tools/telemetry/telemetry/core/backends/chrome/ios_browser_finder.py b/tools/telemetry/telemetry/core/backends/chrome/ios_browser_finder.py
index 3b2f109..b788a45 100644
--- a/tools/telemetry/telemetry/core/backends/chrome/ios_browser_finder.py
+++ b/tools/telemetry/telemetry/core/backends/chrome/ios_browser_finder.py
@@ -6,6 +6,7 @@
 
 import logging
 import re
+import subprocess
 
 from telemetry.core.backends.chrome import ios_browser_backend
 from telemetry.core.backends.chrome_inspector import inspector_backend
@@ -14,6 +15,7 @@ from telemetry.core import platform
 from telemetry.core.platform import ios_device
 from telemetry.core.platform import ios_platform_backend
 from telemetry.core import possible_browser
+from telemetry import decorators
 
 
 # Key matches output from ios-webkit-debug-proxy and the value is a readable
diff --git a/tools/telemetry/telemetry/core/backends/chrome_inspector/devtools_client_backend_unittest.py b/tools/telemetry/telemetry/core/backends/chrome_inspector/devtools_client_backend_unittest.py
index 65f44f7..b824b4e 100644
--- a/tools/telemetry/telemetry/core/backends/chrome_inspector/devtools_client_backend_unittest.py
+++ b/tools/telemetry/telemetry/core/backends/chrome_inspector/devtools_client_backend_unittest.py
@@ -2,6 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+from telemetry.core.backends.chrome_inspector import devtools_client_backend
+from telemetry.core.backends.chrome_inspector import devtools_http
 from telemetry import decorators
 from telemetry.unittest_util import browser_test_case
 
diff --git a/tools/telemetry/telemetry/core/backends/chrome_inspector/devtools_http_unittest.py b/tools/telemetry/telemetry/core/backends/chrome_inspector/devtools_http_unittest.py
index 092a462..e148b59 100644
--- a/tools/telemetry/telemetry/core/backends/chrome_inspector/devtools_http_unittest.py
+++ b/tools/telemetry/telemetry/core/backends/chrome_inspector/devtools_http_unittest.py
@@ -2,7 +2,10 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import httplib
+import socket
 import unittest
+import urllib2
 
 from telemetry.core.backends.chrome_inspector import devtools_http
 
diff --git a/tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_backend.py b/tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_backend.py
index 1290153..0f0df14 100644
--- a/tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_backend.py
+++ b/tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_backend.py
@@ -17,7 +17,9 @@ from telemetry.core.backends.chrome_inspector import inspector_runtime
 from telemetry.core.backends.chrome_inspector import inspector_websocket
 from telemetry.core.backends.chrome_inspector import websocket
 from telemetry.core import exceptions
+from telemetry.core import util
 from telemetry import decorators
+from telemetry.image_processing import image_util
 from telemetry.timeline import model as timeline_model_module
 from telemetry.timeline import trace_data as trace_data_module
 
diff --git a/tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_backend_list.py b/tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_backend_list.py
index 741928b..89a7ada 100644
--- a/tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_backend_list.py
+++ b/tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_backend_list.py
@@ -4,7 +4,9 @@
 
 import collections
 import logging
+import sys
 
+from telemetry.core.backends.chrome_inspector import inspector_backend
 from telemetry.core import exceptions
 
 
@@ -40,7 +42,7 @@ class InspectorBackendList(collections.Sequence):
   def GetContextInfo(self, context_id):
     return self._devtools_context_map_backend.GetContextInfo(context_id)
 
-  def ShouldIncludeContext(self, _):
+  def ShouldIncludeContext(self, _context):
     """Override this method to control which contexts are included."""
     return True
 
diff --git a/tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_page.py b/tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_page.py
index ed04623..8afc18e 100644
--- a/tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_page.py
+++ b/tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_page.py
@@ -1,6 +1,7 @@
 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
+import sys
 import time
 
 from telemetry.image_processing import image_util
diff --git a/tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_page_unittest.py b/tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_page_unittest.py
index 5f94010..61a9bf9 100644
--- a/tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_page_unittest.py
+++ b/tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_page_unittest.py
@@ -2,6 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+from telemetry import decorators
 from telemetry.image_processing import image_util
 from telemetry.unittest_util import tab_test_case
 
diff --git a/tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_websocket.py b/tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_websocket.py
index e63e23e..3ea734d 100644
--- a/tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_websocket.py
+++ b/tools/telemetry/telemetry/core/backends/chrome_inspector/inspector_websocket.py
@@ -2,8 +2,11 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import collections
 import json
 import logging
+import socket
+import time
 
 from telemetry.core.backends.chrome_inspector import websocket
 from telemetry.core import exceptions
diff --git a/tools/telemetry/telemetry/core/backends/chrome_inspector/tracing_backend_unittest.py b/tools/telemetry/telemetry/core/backends/chrome_inspector/tracing_backend_unittest.py
index 716b153..8253f82 100644
--- a/tools/telemetry/telemetry/core/backends/chrome_inspector/tracing_backend_unittest.py
+++ b/tools/telemetry/telemetry/core/backends/chrome_inspector/tracing_backend_unittest.py
@@ -2,19 +2,24 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import cStringIO
+import json
 import unittest
 
+from telemetry.core.backends.chrome_inspector import inspector_websocket
 from telemetry.core.backends.chrome_inspector import tracing_backend
 from telemetry.core.backends.chrome_inspector import websocket
 from telemetry.core.platform import tracing_category_filter
 from telemetry.core.platform import tracing_options
 from telemetry.core import util
+from telemetry import decorators
 from telemetry.timeline import model as model_module
+from telemetry.timeline import trace_data as trace_data_module
 from telemetry.unittest_util import simple_mock
 from telemetry.unittest_util import tab_test_case
 
 util.AddDirToPythonPath(util.GetTelemetryDir(), 'third_party', 'mock')
-import mock  # pylint:disable=import-error
+import mock
 
 
 class FakeInspectorWebsocket(object):
diff --git a/tools/telemetry/telemetry/core/device_finder.py b/tools/telemetry/telemetry/core/device_finder.py
index fe3f83f..beae258 100644
--- a/tools/telemetry/telemetry/core/device_finder.py
+++ b/tools/telemetry/telemetry/core/device_finder.py
@@ -4,6 +4,8 @@
 
 """Finds devices that can be controlled by telemetry."""
 
+import logging
+
 from telemetry.core.platform import android_device
 from telemetry.core.platform import cros_device
 from telemetry.core.platform import desktop_device
diff --git a/tools/telemetry/telemetry/core/platform/android_device_unittest.py b/tools/telemetry/telemetry/core/platform/android_device_unittest.py
index b8a61dd..6e7609b 100644
--- a/tools/telemetry/telemetry/core/platform/android_device_unittest.py
+++ b/tools/telemetry/telemetry/core/platform/android_device_unittest.py
@@ -4,6 +4,7 @@
 
 import unittest
 
+from telemetry import benchmark
 from telemetry.core import browser_options
 from telemetry.core.platform import android_device
 from telemetry.core.platform import android_platform_backend
@@ -42,7 +43,7 @@ class GetDeviceTest(unittest.TestCase):
   def testNoAdbReturnsNone(self):
     finder_options = browser_options.BrowserFinderOptions()
 
-    def NoAdb(*_1, **_2):
+    def NoAdb(*_, **__):
       raise OSError('not found')
     self._android_device_stub.subprocess.Popen = NoAdb
 
diff --git a/tools/telemetry/telemetry/core/platform/android_platform_backend.py b/tools/telemetry/telemetry/core/platform/android_platform_backend.py
index f84a4ea..00aad43 100644
--- a/tools/telemetry/telemetry/core/platform/android_platform_backend.py
+++ b/tools/telemetry/telemetry/core/platform/android_platform_backend.py
@@ -8,6 +8,7 @@ import re
 import shutil
 import subprocess
 import tempfile
+import time
 
 from telemetry.core.backends import adb_commands
 from telemetry.core import exceptions
@@ -31,21 +32,22 @@ from telemetry.util import external_modules
 psutil = external_modules.ImportOptionalModule('psutil')
 util.AddDirToPythonPath(util.GetChromiumSrcDir(),
                         'third_party', 'webpagereplay')
-import adb_install_cert  # pylint: disable=import-error
-import certutils  # pylint: disable=import-error
-import platformsettings  # pylint: disable=import-error
+import adb_install_cert  # pylint: disable=F0401
+import certutils  # pylint: disable=F0401
+import platformsettings  # pylint: disable=F0401
 
 # Get build/android scripts into our path.
 util.AddDirToPythonPath(util.GetChromiumSrcDir(), 'build', 'android')
-from pylib.device import battery_utils # pylint: disable=import-error
-from pylib.perf import cache_control  # pylint: disable=import-error
-from pylib.perf import perf_control  # pylint: disable=import-error
-from pylib.perf import thermal_throttle  # pylint: disable=import-error
-from pylib.utils import device_temp_file # pylint: disable=import-error
-from pylib import screenshot  # pylint: disable=import-error
+from pylib.device import battery_utils # pylint: disable=F0401
+from pylib.device import device_errors  # pylint: disable=F0401
+from pylib.perf import cache_control  # pylint: disable=F0401
+from pylib.perf import perf_control  # pylint: disable=F0401
+from pylib.perf import thermal_throttle  # pylint: disable=F0401
+from pylib.utils import device_temp_file # pylint: disable=F0401
+from pylib import screenshot  # pylint: disable=F0401
 
 try:
-  from pylib.perf import surface_stats_collector  # pylint: disable=import-error
+  from pylib.perf import surface_stats_collector  # pylint: disable=F0401
 except Exception:
   surface_stats_collector = None
 
diff --git a/tools/telemetry/telemetry/core/platform/cros_interface.py b/tools/telemetry/telemetry/core/platform/cros_interface.py
index 92527d0..a3c3316 100644
--- a/tools/telemetry/telemetry/core/platform/cros_interface.py
+++ b/tools/telemetry/telemetry/core/platform/cros_interface.py
@@ -6,6 +6,7 @@ import logging
 import os
 import re
 import shutil
+import socket
 import stat
 import subprocess
 import tempfile
diff --git a/tools/telemetry/telemetry/core/platform/linux_platform_backend_unittest.py b/tools/telemetry/telemetry/core/platform/linux_platform_backend_unittest.py
index 8e714e3..1059285 100644
--- a/tools/telemetry/telemetry/core/platform/linux_platform_backend_unittest.py
+++ b/tools/telemetry/telemetry/core/platform/linux_platform_backend_unittest.py
@@ -10,7 +10,7 @@ from telemetry.core import util
 from telemetry import decorators
 
 util.AddDirToPythonPath(util.GetTelemetryDir(), 'third_party', 'mock')
-import mock  # pylint:disable=import-error
+import mock
 
 
 class LinuxPlatformBackendTest(unittest.TestCase):
diff --git a/tools/telemetry/telemetry/core/platform/power_monitor/android_dumpsys_power_monitor.py b/tools/telemetry/telemetry/core/platform/power_monitor/android_dumpsys_power_monitor.py
index 5ca608e..f6da6ac 100644
--- a/tools/telemetry/telemetry/core/platform/power_monitor/android_dumpsys_power_monitor.py
+++ b/tools/telemetry/telemetry/core/platform/power_monitor/android_dumpsys_power_monitor.py
@@ -2,9 +2,11 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+from collections import defaultdict
 import csv
 import logging
 
+from telemetry.core import util
 from telemetry.core.platform.power_monitor import sysfs_power_monitor
 
 
diff --git a/tools/telemetry/telemetry/core/platform/power_monitor/android_dumpsys_power_monitor_unittest.py b/tools/telemetry/telemetry/core/platform/power_monitor/android_dumpsys_power_monitor_unittest.py
index cc0b6c0..be966b4 100644
--- a/tools/telemetry/telemetry/core/platform/power_monitor/android_dumpsys_power_monitor_unittest.py
+++ b/tools/telemetry/telemetry/core/platform/power_monitor/android_dumpsys_power_monitor_unittest.py
@@ -2,9 +2,11 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import os
 import unittest
 
 from telemetry.core.platform.power_monitor import android_dumpsys_power_monitor
+from telemetry.core.util import GetUnittestDataDir
 
 
 class DumpsysPowerMonitorMonitorTest(unittest.TestCase):
diff --git a/tools/telemetry/telemetry/core/platform/profiler/trace_profiler_unittest.py b/tools/telemetry/telemetry/core/platform/profiler/trace_profiler_unittest.py
index 2e27d7d..d32a513 100644
--- a/tools/telemetry/telemetry/core/platform/profiler/trace_profiler_unittest.py
+++ b/tools/telemetry/telemetry/core/platform/profiler/trace_profiler_unittest.py
@@ -8,6 +8,7 @@ import tempfile
 import zipfile
 
 from telemetry.core.platform.profiler import trace_profiler
+from telemetry import decorators
 from telemetry.unittest_util import tab_test_case
 
 
diff --git a/tools/telemetry/telemetry/core/platform/tracing_controller_backend.py b/tools/telemetry/telemetry/core/platform/tracing_controller_backend.py
index 2e86f6e..fbb0c1c 100644
--- a/tools/telemetry/telemetry/core/platform/tracing_controller_backend.py
+++ b/tools/telemetry/telemetry/core/platform/tracing_controller_backend.py
@@ -7,6 +7,7 @@ import os
 from telemetry.core import discover
 from telemetry.core.platform import tracing_agent
 from telemetry.core.platform.tracing_agent import chrome_tracing_agent
+from telemetry.core.platform.tracing_agent import display_tracing_agent
 from telemetry.core.platform import tracing_category_filter
 from telemetry.core.platform import tracing_options
 from telemetry.core import util
@@ -27,6 +28,7 @@ class TracingControllerBackend(object):
     self._current_trace_options = None
     self._current_category_filter = None
     self._current_chrome_tracing_agent = None
+    self._current_display_tracing_agent = None
     self._supported_agents_classes = [
         agent_classes for agent_classes in _IterAllTracingAgentClasses() if
         agent_classes.IsSupported(platform_backend)]
diff --git a/tools/telemetry/telemetry/image_processing/histogram_unittest.py b/tools/telemetry/telemetry/image_processing/histogram_unittest.py
index 9e24f13..69e8d5a 100644
--- a/tools/telemetry/telemetry/image_processing/histogram_unittest.py
+++ b/tools/telemetry/telemetry/image_processing/histogram_unittest.py
@@ -4,6 +4,7 @@
 
 import unittest
 
+from telemetry import benchmark
 from telemetry.image_processing import histogram
 from telemetry.image_processing import image_util
 from telemetry.image_processing.rgba_color import RgbaColor
diff --git a/tools/telemetry/telemetry/image_processing/image_util_unittest.py b/tools/telemetry/telemetry/image_processing/image_util_unittest.py
index 6ca537e..540bf3e 100644
--- a/tools/telemetry/telemetry/image_processing/image_util_unittest.py
+++ b/tools/telemetry/telemetry/image_processing/image_util_unittest.py
@@ -6,6 +6,7 @@ import os
 import tempfile
 import unittest
 
+from telemetry import benchmark
 from telemetry.core import util
 from telemetry.image_processing import image_util
 from telemetry.image_processing.rgba_color import RgbaColor
diff --git a/tools/telemetry/telemetry/internal/actions/action_runner_unittest.py b/tools/telemetry/telemetry/internal/actions/action_runner_unittest.py
index 08183fa..da98466 100644
--- a/tools/telemetry/telemetry/internal/actions/action_runner_unittest.py
+++ b/tools/telemetry/telemetry/internal/actions/action_runner_unittest.py
@@ -15,7 +15,7 @@ from telemetry.unittest_util import tab_test_case
 from telemetry.web_perf import timeline_interaction_record as tir_module
 
 util.AddDirToPythonPath(util.GetTelemetryDir(), 'third_party', 'mock')
-import mock  # pylint:disable=import-error
+import mock
 
 
 class ActionRunnerInteractionTest(tab_test_case.TabTestCase):
diff --git a/tools/telemetry/telemetry/internal/actions/mouse_click_unittest.py b/tools/telemetry/telemetry/internal/actions/mouse_click_unittest.py
index 70813d6..4e1c0b3 100644
--- a/tools/telemetry/telemetry/internal/actions/mouse_click_unittest.py
+++ b/tools/telemetry/telemetry/internal/actions/mouse_click_unittest.py
@@ -2,6 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import os
+
 from telemetry.core import exceptions
 from telemetry.internal.actions import mouse_click
 from telemetry.unittest_util import tab_test_case
diff --git a/tools/telemetry/telemetry/internal/actions/scroll_unittest.py b/tools/telemetry/telemetry/internal/actions/scroll_unittest.py
index d0798c8..29bd285 100644
--- a/tools/telemetry/telemetry/internal/actions/scroll_unittest.py
+++ b/tools/telemetry/telemetry/internal/actions/scroll_unittest.py
@@ -4,8 +4,10 @@
 
 import os
 
+from telemetry import decorators
 from telemetry.internal.actions import scroll
 from telemetry.unittest_util import tab_test_case
+from telemetry.core.backends.chrome_inspector import devtools_client_backend
 
 class ScrollActionTest(tab_test_case.TabTestCase):
   def testScrollAction(self):
diff --git a/tools/telemetry/telemetry/page/action_runner.py b/tools/telemetry/telemetry/page/action_runner.py
index 496adce..b42157a 100644
--- a/tools/telemetry/telemetry/page/action_runner.py
+++ b/tools/telemetry/telemetry/page/action_runner.py
@@ -6,6 +6,7 @@ import logging
 import time
 import urlparse
 
+from telemetry.core import exceptions
 from telemetry.internal.actions.drag import DragAction
 from telemetry.internal.actions.javascript_click import ClickElementAction
 from telemetry.internal.actions.loop import LoopAction
diff --git a/tools/telemetry/telemetry/page/page_set.py b/tools/telemetry/telemetry/page/page_set.py
index 5a0b9f6..be3d5ee 100644
--- a/tools/telemetry/telemetry/page/page_set.py
+++ b/tools/telemetry/telemetry/page/page_set.py
@@ -2,6 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import csv
+import inspect
 import os
 
 from telemetry.page import page as page_module
diff --git a/tools/telemetry/telemetry/page/page_set_unittest.py b/tools/telemetry/telemetry/page/page_set_unittest.py
index 9545c70..0e764a2 100644
--- a/tools/telemetry/telemetry/page/page_set_unittest.py
+++ b/tools/telemetry/telemetry/page/page_set_unittest.py
@@ -8,6 +8,7 @@ import unittest
 
 from telemetry.page import page
 from telemetry.page import page_set
+from telemetry.util import cloud_storage
 
 
 class TestPageSet(unittest.TestCase):
diff --git a/tools/telemetry/telemetry/page/shared_page_state_unittest.py b/tools/telemetry/telemetry/page/shared_page_state_unittest.py
index 2731ef6..b45f65b 100644
--- a/tools/telemetry/telemetry/page/shared_page_state_unittest.py
+++ b/tools/telemetry/telemetry/page/shared_page_state_unittest.py
@@ -5,12 +5,14 @@
 import tempfile
 import unittest
 
+from telemetry.core import browser_finder
 from telemetry.core import wpr_modes
 from telemetry.page import page
 from telemetry.page import page_set
 from telemetry.page import page_test
 from telemetry.page import shared_page_state
 from telemetry.unittest_util import options_for_unittests
+from telemetry import user_story
 from telemetry.user_story import user_story_runner
 from telemetry.user_story import user_story_set
 
diff --git a/tools/telemetry/telemetry/results/json_output_formatter.py b/tools/telemetry/telemetry/results/json_output_formatter.py
index 7564755..7ef539d 100644
--- a/tools/telemetry/telemetry/results/json_output_formatter.py
+++ b/tools/telemetry/telemetry/results/json_output_formatter.py
@@ -3,8 +3,10 @@
 # found in the LICENSE file.
 
 import json
+import os
 
 from telemetry.results import output_formatter
+from telemetry.util import file_handle
 
 
 def ResultsAsDict(page_test_results, benchmark_metadata):
diff --git a/tools/telemetry/telemetry/results/page_test_results.py b/tools/telemetry/telemetry/results/page_test_results.py
index 336621c..723748b 100644
--- a/tools/telemetry/telemetry/results/page_test_results.py
+++ b/tools/telemetry/telemetry/results/page_test_results.py
@@ -5,6 +5,7 @@
 import collections
 import copy
 import datetime
+import itertools
 import logging
 import random
 import sys
diff --git a/tools/telemetry/telemetry/results/user_story_run_unittest.py b/tools/telemetry/telemetry/results/user_story_run_unittest.py
index 41f076c..0af37a2 100644
--- a/tools/telemetry/telemetry/results/user_story_run_unittest.py
+++ b/tools/telemetry/telemetry/results/user_story_run_unittest.py
@@ -2,6 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import os
 import unittest
 
 from telemetry.results import user_story_run
diff --git a/tools/telemetry/telemetry/timeline/tab_id_importer_unittest.py b/tools/telemetry/telemetry/timeline/tab_id_importer_unittest.py
index bdb6da2..25015e4 100644
--- a/tools/telemetry/telemetry/timeline/tab_id_importer_unittest.py
+++ b/tools/telemetry/telemetry/timeline/tab_id_importer_unittest.py
@@ -2,6 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import json
 import unittest
 
 from telemetry.timeline import model as timeline_model
diff --git a/tools/telemetry/telemetry/timeline/trace_data.py b/tools/telemetry/telemetry/timeline/trace_data.py
index 25b129d..859ec83 100644
--- a/tools/telemetry/telemetry/timeline/trace_data.py
+++ b/tools/telemetry/telemetry/timeline/trace_data.py
@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 import json
+import numbers
 
 class NonSerializableTraceData(Exception):
   """Raised when raw trace data cannot be serialized to TraceData."""
diff --git a/tools/telemetry/telemetry/timeline/trace_data_unittest.py b/tools/telemetry/telemetry/timeline/trace_data_unittest.py
index 491142e..4c24317 100644
--- a/tools/telemetry/telemetry/timeline/trace_data_unittest.py
+++ b/tools/telemetry/telemetry/timeline/trace_data_unittest.py
@@ -4,8 +4,10 @@
 
 import cStringIO
 import json
+import logging
 import unittest
 
+from telemetry.core import util
 from telemetry.timeline import trace_data
 
 class TraceDataTest(unittest.TestCase):
diff --git a/tools/telemetry/telemetry/timeline/trace_event_importer.py b/tools/telemetry/telemetry/timeline/trace_event_importer.py
index 548473a..49aad15 100644
--- a/tools/telemetry/telemetry/timeline/trace_event_importer.py
+++ b/tools/telemetry/telemetry/timeline/trace_event_importer.py
@@ -8,6 +8,8 @@ https://code.google.com/p/trace-viewer/
 """
 
 import copy
+import json
+import re
 
 import telemetry.timeline.async_slice as tracing_async_slice
 import telemetry.timeline.flow_event as tracing_flow_event
diff --git a/tools/telemetry/telemetry/timeline/trace_event_importer_unittest.py b/tools/telemetry/telemetry/timeline/trace_event_importer_unittest.py
index acd8b66..e8a3d36 100644
--- a/tools/telemetry/telemetry/timeline/trace_event_importer_unittest.py
+++ b/tools/telemetry/telemetry/timeline/trace_event_importer_unittest.py
@@ -2,11 +2,13 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import json
 import unittest
 
 import telemetry.timeline.counter as tracing_counter
 import telemetry.timeline.model as timeline_model
 from telemetry.timeline import trace_data as trace_data_module
+from telemetry.timeline import trace_event_importer
 
 
 def FindEventNamed(events, name):
diff --git a/tools/telemetry/telemetry/user_story/android/shared_app_state.py b/tools/telemetry/telemetry/user_story/android/shared_app_state.py
index 979182d..ef3eb8c 100644
--- a/tools/telemetry/telemetry/user_story/android/shared_app_state.py
+++ b/tools/telemetry/telemetry/user_story/android/shared_app_state.py
@@ -1,9 +1,12 @@
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
+import os
+
 from telemetry.core import platform
 from telemetry.core.platform import android_device
 from telemetry.core.platform import android_platform
+from telemetry.core import wpr_modes
 from telemetry.user_story import shared_user_story_state
 from telemetry.web_perf import timeline_based_measurement
 
diff --git a/tools/telemetry/telemetry/user_story/user_story_runner.py b/tools/telemetry/telemetry/user_story/user_story_runner.py
index 331441a..4f3acba 100644
--- a/tools/telemetry/telemetry/user_story/user_story_runner.py
+++ b/tools/telemetry/telemetry/user_story/user_story_runner.py
@@ -5,15 +5,19 @@
 import logging
 import optparse
 import os
+import random
 import sys
 import time
 
 from telemetry.core import exceptions
 from telemetry.core import wpr_modes
 from telemetry.internal.actions import page_action
+from telemetry import page as page_module
+from telemetry.page import page_set as page_set_module
 from telemetry.page import page_test
 from telemetry.results import results_options
 from telemetry.user_story import user_story_filter
+from telemetry.user_story import user_story_set as user_story_set_module
 from telemetry.util import cloud_storage
 from telemetry.util import exception_formatter
 from telemetry.value import failure
diff --git a/tools/telemetry/telemetry/user_story/user_story_runner_unittest.py b/tools/telemetry/telemetry/user_story/user_story_runner_unittest.py
index 1e9c74a..cc8489d 100644
--- a/tools/telemetry/telemetry/user_story/user_story_runner_unittest.py
+++ b/tools/telemetry/telemetry/user_story/user_story_runner_unittest.py
@@ -21,6 +21,7 @@ from telemetry.user_story import user_story_set
 from telemetry.util import cloud_storage
 from telemetry.util import exception_formatter as exception_formatter_module
 from telemetry.value import scalar
+from telemetry.value import string
 from telemetry.web_perf import timeline_based_measurement
 from telemetry.wpr import archive_info
 
diff --git a/tools/telemetry/telemetry/util/cloud_storage_unittest.py b/tools/telemetry/telemetry/util/cloud_storage_unittest.py
index 7e40f44..7ef373a 100644
--- a/tools/telemetry/telemetry/util/cloud_storage_unittest.py
+++ b/tools/telemetry/telemetry/util/cloud_storage_unittest.py
@@ -5,6 +5,8 @@
 import os
 import unittest
 
+from telemetry import decorators
+
 from telemetry.unittest_util import system_stub
 from telemetry.util import cloud_storage
 
diff --git a/tools/telemetry/telemetry/util/file_handle.py b/tools/telemetry/telemetry/util/file_handle.py
index 8133b0d..55c015c 100644
--- a/tools/telemetry/telemetry/util/file_handle.py
+++ b/tools/telemetry/telemetry/util/file_handle.py
@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 import os
+import shutil
 
 
 _next_file_id = 0
diff --git a/tools/telemetry/telemetry/util/file_handle_unittest.py b/tools/telemetry/telemetry/util/file_handle_unittest.py
index da3ca90..12fc4ca 100644
--- a/tools/telemetry/telemetry/util/file_handle_unittest.py
+++ b/tools/telemetry/telemetry/util/file_handle_unittest.py
@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 import os
+import shutil
 import tempfile
 import unittest
 
diff --git a/tools/telemetry/telemetry/value/trace.py b/tools/telemetry/telemetry/value/trace.py
index a31be2c..176eb29 100644
--- a/tools/telemetry/telemetry/value/trace.py
+++ b/tools/telemetry/telemetry/value/trace.py
@@ -21,7 +21,7 @@ from telemetry import value as value_module
 util.AddDirToPythonPath(
     util.GetChromiumSrcDir(), 'third_party', 'trace-viewer')
 
-from trace_viewer.build import trace2html  # pylint:disable=import-error
+from trace_viewer.build import trace2html
 
 class TraceValue(value_module.Value):
   def __init__(self, page, trace_data, important=False, description=None):
diff --git a/tools/telemetry/telemetry/value/trace_unittest.py b/tools/telemetry/telemetry/value/trace_unittest.py
index 7d747d6..d02b2a4 100644
--- a/tools/telemetry/telemetry/value/trace_unittest.py
+++ b/tools/telemetry/telemetry/value/trace_unittest.py
@@ -11,6 +11,7 @@ from telemetry import page as page_module
 from telemetry.page import page_set
 from telemetry.timeline import trace_data
 from telemetry.unittest_util import system_stub
+from telemetry.util import file_handle
 from telemetry.value import trace
 
 
diff --git a/tools/telemetry/telemetry/web_perf/metrics/layout.py b/tools/telemetry/telemetry/web_perf/metrics/layout.py
index 617c2fc..558a9744 100644
--- a/tools/telemetry/telemetry/web_perf/metrics/layout.py
+++ b/tools/telemetry/telemetry/web_perf/metrics/layout.py
@@ -2,6 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import math
 from telemetry.value import list_of_scalar_values
 from telemetry.web_perf.metrics import timeline_based_metric
 
diff --git a/tools/telemetry/telemetry/web_perf/timeline_based_measurement_unittest.py b/tools/telemetry/telemetry/web_perf/timeline_based_measurement_unittest.py
index 21dc698..f1108ee 100644
--- a/tools/telemetry/telemetry/web_perf/timeline_based_measurement_unittest.py
+++ b/tools/telemetry/telemetry/web_perf/timeline_based_measurement_unittest.py
@@ -5,6 +5,7 @@
 import os
 import unittest
 
+from telemetry.core import platform
 from telemetry.page import page as page_module
 from telemetry.page import page_set
 from telemetry.results import page_test_results
@@ -13,6 +14,7 @@ from telemetry.timeline import model as model_module
 from telemetry.value import scalar
 from telemetry.web_perf.metrics import timeline_based_metric
 from telemetry.web_perf import timeline_based_measurement as tbm_module
+from telemetry.web_perf import timeline_interaction_record as tir_module
 
 
 class FakeSmoothMetric(timeline_based_metric.TimelineBasedMetric):