diff --git a/tensorboard/__init__.py b/tensorboard/__init__.py
index f0c16a38ca..6d172de7f1 100644
--- a/tensorboard/__init__.py
+++ b/tensorboard/__init__.py
@@ -69,19 +69,19 @@
 
 @lazy.lazy_load('tensorboard.notebook')
 def notebook():
-  import importlib  # pylint: disable=g-import-not-at-top
+  import importlib
   return importlib.import_module('tensorboard.notebook')
 
 
 @lazy.lazy_load('tensorboard.program')
 def program():
-  import importlib  # pylint: disable=g-import-not-at-top
+  import importlib
   return importlib.import_module('tensorboard.program')
 
 
 @lazy.lazy_load('tensorboard.summary')
 def summary():
-  import importlib  # pylint: disable=g-import-not-at-top
+  import importlib
   return importlib.import_module('tensorboard.summary')
 
 
diff --git a/tensorboard/backend/application_test.py b/tensorboard/backend/application_test.py
index 5d3f7c13e8..cd7dff945e 100644
--- a/tensorboard/backend/application_test.py
+++ b/tensorboard/backend/application_test.py
@@ -33,9 +33,9 @@
 
 try:
   # python version >= 3.3
-  from unittest import mock  # pylint: disable=g-import-not-at-top
+  from unittest import mock
 except ImportError:
-  import mock  # pylint: disable=g-import-not-at-top,unused-import
+  import mock  # pylint: disable=unused-import
 
 from werkzeug import test as werkzeug_test
 from werkzeug import wrappers
diff --git a/tensorboard/backend/event_processing/directory_loader_test.py b/tensorboard/backend/event_processing/directory_loader_test.py
index 2a61b8670d..deaa1030fa 100644
--- a/tensorboard/backend/event_processing/directory_loader_test.py
+++ b/tensorboard/backend/event_processing/directory_loader_test.py
@@ -26,9 +26,9 @@
 
 try:
   # python version >= 3.3
-  from unittest import mock  # pylint: disable=g-import-not-at-top
+  from unittest import mock
 except ImportError:
-  import mock  # pylint: disable=g-import-not-at-top,unused-import
+  import mock  # pylint: disable=unused-import
 
 import tensorflow as tf
 
diff --git a/tensorboard/backend/http_util_test.py b/tensorboard/backend/http_util_test.py
index c972dad0aa..d165450196 100644
--- a/tensorboard/backend/http_util_test.py
+++ b/tensorboard/backend/http_util_test.py
@@ -27,9 +27,9 @@
 
 try:
   # python version >= 3.3
-  from unittest import mock  # pylint: disable=g-import-not-at-top
+  from unittest import mock
 except ImportError:
-  import mock  # pylint: disable=g-import-not-at-top,unused-import
+  import mock  # pylint: disable=unused-import
 
 from werkzeug import test as wtest
 from werkzeug import wrappers
diff --git a/tensorboard/backend/security_validator_test.py b/tensorboard/backend/security_validator_test.py
index 03ad1cf796..9a972c9685 100644
--- a/tensorboard/backend/security_validator_test.py
+++ b/tensorboard/backend/security_validator_test.py
@@ -20,9 +20,9 @@
 
 try:
   # python version >= 3.3
-  from unittest import mock    # pylint: disable=g-import-not-at-top
+  from unittest import mock
 except ImportError:
-  import mock    # pylint: disable=g-import-not-at-top,unused-import
+  import mock    # pylint: disable=unused-import
 
 import werkzeug
 from werkzeug import test as werkzeug_test
diff --git a/tensorboard/compat/__init__.py b/tensorboard/compat/__init__.py
index 634f252d4c..07ee19b17c 100644
--- a/tensorboard/compat/__init__.py
+++ b/tensorboard/compat/__init__.py
@@ -44,14 +44,14 @@ def tf():
     ImportError: if a TF-like API is not available.
   """
   try:
-    from tensorboard.compat import notf  # pylint: disable=g-import-not-at-top
+    from tensorboard.compat import notf
   except ImportError:
     try:
-      import tensorflow  # pylint: disable=g-import-not-at-top
+      import tensorflow
       return tensorflow
     except ImportError:
       pass
-  from tensorboard.compat import tensorflow_stub  # pylint: disable=g-import-not-at-top
+  from tensorboard.compat import tensorflow_stub
   return tensorflow_stub
 
 
@@ -94,12 +94,12 @@ def _pywrap_tensorflow():
     ImportError: if we couldn't import pywrap_tensorflow.
   """
   try:
-    from tensorboard.compat import notf  # pylint: disable=g-import-not-at-top
+    from tensorboard.compat import notf
   except ImportError:
     try:
-      from tensorflow.python import pywrap_tensorflow  # pylint: disable=g-import-not-at-top
+      from tensorflow.python import pywrap_tensorflow
       return pywrap_tensorflow
     except ImportError:
       pass
-  from tensorboard.compat.tensorflow_stub import pywrap_tensorflow  # pylint: disable=g-import-not-at-top
+  from tensorboard.compat.tensorflow_stub import pywrap_tensorflow
   return pywrap_tensorflow
diff --git a/tensorboard/default_test.py b/tensorboard/default_test.py
index c53462edc0..39665af169 100644
--- a/tensorboard/default_test.py
+++ b/tensorboard/default_test.py
@@ -20,9 +20,9 @@
 
 try:
   # python version >= 3.3
-  from unittest import mock  # pylint: disable=g-import-not-at-top
+  from unittest import mock
 except ImportError:
-  import mock  # pylint: disable=g-import-not-at-top,unused-import
+  import mock  # pylint: disable=unused-import
 
 import pkg_resources
 
diff --git a/tensorboard/lazy_test.py b/tensorboard/lazy_test.py
index 328d4ca95f..8ff3f7a204 100644
--- a/tensorboard/lazy_test.py
+++ b/tensorboard/lazy_test.py
@@ -35,7 +35,7 @@ def test_self_composition(self):
 
     @lazy.lazy_load("inner")
     def inner():
-      import collections  # pylint: disable=g-import-not-at-top
+      import collections
       return collections
 
     @lazy.lazy_load("outer")
@@ -70,7 +70,7 @@ def foo():
     self.assertEquals(repr(foo), "<module 'foo' via LazyModule (not yet loaded)>")
 
   def test_repr_after_load(self):
-    import collections  # pylint: disable=g-import-not-at-top
+    import collections
     @lazy.lazy_load("foo")
     def foo():
       return collections
diff --git a/tensorboard/main.py b/tensorboard/main.py
index 5ce413cfe1..2495f335dc 100644
--- a/tensorboard/main.py
+++ b/tensorboard/main.py
@@ -25,7 +25,7 @@
 from __future__ import division
 from __future__ import print_function
 
-# pylint: disable=g-import-not-at-top
+
 import os
 
 # Disable the TF GCS filesystem cache which interacts pathologically with the
@@ -33,7 +33,7 @@
 #   https://github.com/tensorflow/tensorboard/issues/1225
 # This must be set before the first import of tensorflow.
 os.environ['GCS_READ_CACHE_DISABLED'] = '1'
-# pylint: enable=g-import-not-at-top
+
 
 import sys
 
diff --git a/tensorboard/manager_e2e_test.py b/tensorboard/manager_e2e_test.py
index 582b224b05..463054c482 100644
--- a/tensorboard/manager_e2e_test.py
+++ b/tensorboard/manager_e2e_test.py
@@ -36,9 +36,9 @@
 
 try:
   # python version >= 3.3
-  from unittest import mock  # pylint: disable=g-import-not-at-top
+  from unittest import mock
 except ImportError:
-  import mock  # pylint: disable=g-import-not-at-top,unused-import
+  import mock  # pylint: disable=unused-import
 
 from tensorboard import manager
 
diff --git a/tensorboard/manager_test.py b/tensorboard/manager_test.py
index 7cdf7f9f23..032e236035 100644
--- a/tensorboard/manager_test.py
+++ b/tensorboard/manager_test.py
@@ -29,9 +29,9 @@
 
 try:
   # python version >= 3.3
-  from unittest import mock  # pylint: disable=g-import-not-at-top
+  from unittest import mock
 except ImportError:
-  import mock  # pylint: disable=g-import-not-at-top,unused-import
+  import mock  # pylint: disable=unused-import
 
 from tensorboard import manager
 from tensorboard import test as tb_test
diff --git a/tensorboard/plugins/beholder/__init__.py b/tensorboard/plugins/beholder/__init__.py
index 08aa782aeb..d5d71a2d9d 100644
--- a/tensorboard/plugins/beholder/__init__.py
+++ b/tensorboard/plugins/beholder/__init__.py
@@ -14,7 +14,7 @@
 
 # Only import Beholder API when tensorflow is available.
 try:
-  # pylint: disable=g-import-not-at-top,unused-import
+  # pylint: disable=unused-import
   import tensorflow
 except ImportError:
   pass
diff --git a/tensorboard/plugins/beholder/beholder_plugin_loader.py b/tensorboard/plugins/beholder/beholder_plugin_loader.py
index a2a787c6fc..66dd00fca4 100644
--- a/tensorboard/plugins/beholder/beholder_plugin_loader.py
+++ b/tensorboard/plugins/beholder/beholder_plugin_loader.py
@@ -37,10 +37,10 @@ def load(self, context):
       A BeholderPlugin instance or None if it couldn't be loaded.
     """
     try:
-      # pylint: disable=g-import-not-at-top,unused-import
+      # pylint: disable=unused-import
       import tensorflow
     except ImportError:
       return
-    # pylint: disable=g-import-not-at-top
+
     from tensorboard.plugins.beholder.beholder_plugin import BeholderPlugin
     return BeholderPlugin(context)
diff --git a/tensorboard/plugins/debugger/debugger_plugin_loader.py b/tensorboard/plugins/debugger/debugger_plugin_loader.py
index 9977610e00..85a16e660f 100644
--- a/tensorboard/plugins/debugger/debugger_plugin_loader.py
+++ b/tensorboard/plugins/debugger/debugger_plugin_loader.py
@@ -128,7 +128,7 @@ def load(self, context):
     if flags.debugger_data_server_grpc_port > 0 or flags.debugger_port > 0:
       # Verify that the required Python packages are installed.
       try:
-        # pylint: disable=g-import-not-at-top,unused-import
+        # pylint: disable=unused-import
         import tensorflow
       except ImportError:
         raise ImportError(
@@ -136,9 +136,9 @@ def load(self, context):
             '  pip install tensorflow')
 
     if flags.debugger_data_server_grpc_port > 0:
-      # pylint: disable=line-too-long,g-import-not-at-top
+      # pylint: disable=line-too-long
       from tensorboard.plugins.debugger import debugger_plugin as debugger_plugin_lib
-      # pylint: enable=line-too-long,g-import-not-at-top
+      # pylint: enable=line-too-long
 
       # debugger_data_server_grpc opens the non-interactive Debugger Plugin,
       # which appears as health pills in the Graph Plugin.
@@ -148,9 +148,9 @@ def load(self, context):
       noninteractive_plugin.listen(flags.debugger_data_server_grpc_port)
       return noninteractive_plugin
     elif flags.debugger_port > 0:
-      # pylint: disable=line-too-long,g-import-not-at-top
+      # pylint: disable=line-too-long
       from tensorboard.plugins.debugger import interactive_debugger_plugin as interactive_debugger_plugin_lib
-      # pylint: enable=line-too-long,g-import-not-at-top
+      # pylint: enable=line-too-long
       interactive_plugin = (
           interactive_debugger_plugin_lib.InteractiveDebuggerPlugin(context))
       logger.info('Starting Interactive Debugger Plugin at gRPC port %d',
diff --git a/tensorboard/plugins/debugger/debugger_plugin_testlib.py b/tensorboard/plugins/debugger/debugger_plugin_testlib.py
index 36d4d0d648..e8a3de85b5 100644
--- a/tensorboard/plugins/debugger/debugger_plugin_testlib.py
+++ b/tensorboard/plugins/debugger/debugger_plugin_testlib.py
@@ -53,10 +53,10 @@ def setUp(self):
     super(DebuggerPluginTestBase, self).setUp()
     # Importing the debugger_plugin can sometimes unfortunately produce errors.
     try:
-      # pylint: disable=g-import-not-at-top
+
       from tensorboard.plugins.debugger import debugger_plugin
       from tensorboard.plugins.debugger import debugger_server_lib
-      # pylint: enable=g-import-not-at-top
+
     except Exception as e:  # pylint: disable=broad-except
       raise self.skipTest(
           'Skipping test because importing some modules failed: %r' % e)
diff --git a/tensorboard/plugins/hparams/backend_context_test.py b/tensorboard/plugins/hparams/backend_context_test.py
index a75f48ab02..e34133e80d 100644
--- a/tensorboard/plugins/hparams/backend_context_test.py
+++ b/tensorboard/plugins/hparams/backend_context_test.py
@@ -22,9 +22,9 @@
 
 try:
   # python version >= 3.3
-  from unittest import mock  # pylint: disable=g-import-not-at-top
+  from unittest import mock
 except ImportError:
-  import mock  # pylint: disable=g-import-not-at-top,unused-import
+  import mock  # pylint: disable=unused-import
 import tensorflow as tf
 
 from google.protobuf import text_format
diff --git a/tensorboard/plugins/hparams/keras_test.py b/tensorboard/plugins/hparams/keras_test.py
index d17fc7beaa..6c3ddb761c 100644
--- a/tensorboard/plugins/hparams/keras_test.py
+++ b/tensorboard/plugins/hparams/keras_test.py
@@ -26,9 +26,9 @@
 
 try:
   # python version >= 3.3
-  from unittest import mock  # pylint: disable=g-import-not-at-top
+  from unittest import mock
 except ImportError:
-  import mock  # pylint: disable=g-import-not-at-top,unused-import
+  import mock  # pylint: disable=unused-import
 
 from tensorboard.plugins.hparams import keras
 from tensorboard.plugins.hparams import metadata
diff --git a/tensorboard/plugins/hparams/list_metric_evals_test.py b/tensorboard/plugins/hparams/list_metric_evals_test.py
index 4837a50d58..92485cca4c 100644
--- a/tensorboard/plugins/hparams/list_metric_evals_test.py
+++ b/tensorboard/plugins/hparams/list_metric_evals_test.py
@@ -20,9 +20,9 @@
 
 try:
   # python version >= 3.3
-  from unittest import mock  # pylint: disable=g-import-not-at-top
+  from unittest import mock
 except ImportError:
-  import mock  # pylint: disable=g-import-not-at-top,unused-import
+  import mock  # pylint: disable=unused-import
 import tensorflow as tf
 
 from google.protobuf import text_format
diff --git a/tensorboard/plugins/hparams/list_session_groups_test.py b/tensorboard/plugins/hparams/list_session_groups_test.py
index f9c5705875..9184c12e5c 100644
--- a/tensorboard/plugins/hparams/list_session_groups_test.py
+++ b/tensorboard/plugins/hparams/list_session_groups_test.py
@@ -23,9 +23,9 @@
 import tensorflow as tf
 try:
   # python version >= 3.3
-  from unittest import mock  # pylint: disable=g-import-not-at-top
+  from unittest import mock
 except ImportError:
-  import mock  # pylint: disable=g-import-not-at-top,unused-import
+  import mock  # pylint: disable=unused-import
 
 from google.protobuf import text_format
 from tensorboard.backend.event_processing import event_accumulator
diff --git a/tensorboard/plugins/hparams/summary_v2_test.py b/tensorboard/plugins/hparams/summary_v2_test.py
index dc59baf28d..aa915bfedd 100644
--- a/tensorboard/plugins/hparams/summary_v2_test.py
+++ b/tensorboard/plugins/hparams/summary_v2_test.py
@@ -31,9 +31,9 @@
 
 try:
   # python version >= 3.3
-  from unittest import mock  # pylint: disable=g-import-not-at-top
+  from unittest import mock
 except ImportError:
-  import mock  # pylint: disable=g-import-not-at-top,unused-import
+  import mock  # pylint: disable=unused-import
 
 from tensorboard import test
 from tensorboard.compat import tf
diff --git a/tensorboard/plugins/interactive_inference/interactive_inference_plugin_loader.py b/tensorboard/plugins/interactive_inference/interactive_inference_plugin_loader.py
index ddc974fa76..3e110b3ae7 100644
--- a/tensorboard/plugins/interactive_inference/interactive_inference_plugin_loader.py
+++ b/tensorboard/plugins/interactive_inference/interactive_inference_plugin_loader.py
@@ -37,10 +37,10 @@ def load(self, context):
       A InteractiveInferencePlugin instance or None if it couldn't be loaded.
     """
     try:
-      # pylint: disable=g-import-not-at-top,unused-import
+      # pylint: disable=unused-import
       import tensorflow
     except ImportError:
       return
-    # pylint: disable=line-too-long,g-import-not-at-top
+    # pylint: disable=line-too-long
     from tensorboard.plugins.interactive_inference.interactive_inference_plugin import InteractiveInferencePlugin
     return InteractiveInferencePlugin(context)
diff --git a/tensorboard/plugins/interactive_inference/interactive_inference_plugin_test.py b/tensorboard/plugins/interactive_inference/interactive_inference_plugin_test.py
index 88bcc72eee..417dd17687 100644
--- a/tensorboard/plugins/interactive_inference/interactive_inference_plugin_test.py
+++ b/tensorboard/plugins/interactive_inference/interactive_inference_plugin_test.py
@@ -27,9 +27,9 @@
 
 try:
   # python version >= 3.3
-  from unittest import mock  # pylint: disable=g-import-not-at-top
+  from unittest import mock
 except ImportError:
-  import mock  # pylint: disable=g-import-not-at-top,unused-import
+  import mock  # pylint: disable=unused-import
 
 from six.moves import urllib_parse
 from google.protobuf import json_format
diff --git a/tensorboard/plugins/interactive_inference/utils/inference_utils_test.py b/tensorboard/plugins/interactive_inference/utils/inference_utils_test.py
index c55c95ccf4..6598a4940a 100644
--- a/tensorboard/plugins/interactive_inference/utils/inference_utils_test.py
+++ b/tensorboard/plugins/interactive_inference/utils/inference_utils_test.py
@@ -26,9 +26,9 @@
 
 try:
   # python version >= 3.3
-  from unittest import mock  # pylint: disable=g-import-not-at-top
+  from unittest import mock
 except ImportError:
-  import mock  # pylint: disable=g-import-not-at-top,unused-import
+  import mock  # pylint: disable=unused-import
 
 from tensorflow_serving.apis import classification_pb2
 from tensorflow_serving.apis import predict_pb2
diff --git a/tensorboard/plugins/interactive_inference/witwidget/notebook/visualization.py b/tensorboard/plugins/interactive_inference/witwidget/notebook/visualization.py
index 98e5cd051a..98ca6c9de1 100644
--- a/tensorboard/plugins/interactive_inference/witwidget/notebook/visualization.py
+++ b/tensorboard/plugins/interactive_inference/witwidget/notebook/visualization.py
@@ -22,9 +22,9 @@ def _is_colab():
 
 
 if _is_colab():
-  from witwidget.notebook.colab.wit import *  # pylint: disable=wildcard-import,g-import-not-at-top
+  from witwidget.notebook.colab.wit import *  # pylint: disable=wildcard-import
 else:
-  from witwidget.notebook.jupyter.wit import *  # pylint: disable=wildcard-import,g-import-not-at-top
+  from witwidget.notebook.jupyter.wit import *  # pylint: disable=wildcard-import
 
 
 class WitConfigBuilder(object):
diff --git a/tensorboard/plugins/mesh/mesh_plugin_test.py b/tensorboard/plugins/mesh/mesh_plugin_test.py
index f5bf7a2e1d..4c602d42f3 100644
--- a/tensorboard/plugins/mesh/mesh_plugin_test.py
+++ b/tensorboard/plugins/mesh/mesh_plugin_test.py
@@ -39,9 +39,9 @@
 
 try:
   # python version >= 3.3
-  from unittest import mock  # pylint: disable=g-import-not-at-top
+  from unittest import mock
 except ImportError:
-  import mock  # pylint: disable=g-import-not-at-top,unused-import
+  import mock  # pylint: disable=unused-import
 
 
 class MeshPluginTest(tf.test.TestCase):
diff --git a/tensorboard/plugins/profile/profile_plugin_loader.py b/tensorboard/plugins/profile/profile_plugin_loader.py
index 60c4dff777..cdd4ee856f 100644
--- a/tensorboard/plugins/profile/profile_plugin_loader.py
+++ b/tensorboard/plugins/profile/profile_plugin_loader.py
@@ -49,13 +49,13 @@ def load(self, context):
       A ProfilePlugin instance or None if it couldn't be loaded.
     """
     try:
-      # pylint: disable=g-import-not-at-top,unused-import
+      # pylint: disable=unused-import
       import tensorflow
       # Available in TensorFlow 1.14 or later, so do import check
-      # pylint: disable=g-import-not-at-top,unused-import
+      # pylint: disable=unused-import
       from tensorflow.python.eager import profiler_client
     except ImportError:
       return
-    # pylint: disable=g-import-not-at-top
+
     from tensorboard.plugins.profile.profile_plugin import ProfilePlugin
     return ProfilePlugin(context)
diff --git a/tensorboard/program_test.py b/tensorboard/program_test.py
index b30510c61d..1ed1dcbdf2 100644
--- a/tensorboard/program_test.py
+++ b/tensorboard/program_test.py
@@ -26,9 +26,9 @@
 
 try:
   # python version >= 3.3
-  from unittest import mock  # pylint: disable=g-import-not-at-top
+  from unittest import mock
 except ImportError:
-  import mock  # pylint: disable=g-import-not-at-top,unused-import
+  import mock  # pylint: disable=unused-import
 
 from tensorboard import program
 from tensorboard import test as tb_test
diff --git a/tensorboard/summary/_tf/summary/__init__.py b/tensorboard/summary/_tf/summary/__init__.py
index 7a0b8c59e5..89045f24cf 100644
--- a/tensorboard/summary/_tf/summary/__init__.py
+++ b/tensorboard/summary/_tf/summary/__init__.py
@@ -121,7 +121,7 @@ def reexport_tf_summary():
 
   Lastly, this logic is encapsulated in a function to avoid symbol leakage.
   """
-  import sys  # pylint: disable=g-import-not-at-top
+  import sys
 
   # API packages to check for the original V2 summary API, in preference order
   # to avoid going "under the hood" to the _api packages unless necessary.
diff --git a/tensorboard/uploader/exporter_test.py b/tensorboard/uploader/exporter_test.py
index aef6947ee3..3fe06f016b 100644
--- a/tensorboard/uploader/exporter_test.py
+++ b/tensorboard/uploader/exporter_test.py
@@ -28,9 +28,9 @@
 
 try:
   # python version >= 3.3
-  from unittest import mock  # pylint: disable=g-import-not-at-top
+  from unittest import mock
 except ImportError:
-  import mock  # pylint: disable=g-import-not-at-top,unused-import
+  import mock  # pylint: disable=unused-import
 
 
 from tensorboard.uploader.proto import export_service_pb2
diff --git a/tensorboard/uploader/uploader_test.py b/tensorboard/uploader/uploader_test.py
index f1abefb1cc..db760b30c2 100644
--- a/tensorboard/uploader/uploader_test.py
+++ b/tensorboard/uploader/uploader_test.py
@@ -26,9 +26,9 @@
 
 try:
   # python version >= 3.3
-  from unittest import mock  # pylint: disable=g-import-not-at-top
+  from unittest import mock
 except ImportError:
-  import mock  # pylint: disable=g-import-not-at-top,unused-import
+  import mock  # pylint: disable=unused-import
 
 import tensorflow as tf
 
diff --git a/tensorboard/uploader/util_test.py b/tensorboard/uploader/util_test.py
index fef9d67d8e..444797e7da 100644
--- a/tensorboard/uploader/util_test.py
+++ b/tensorboard/uploader/util_test.py
@@ -26,9 +26,9 @@
 
 try:
   # python version >= 3.3
-  from unittest import mock  # pylint: disable=g-import-not-at-top
+  from unittest import mock
 except ImportError:
-  import mock  # pylint: disable=g-import-not-at-top,unused-import
+  import mock  # pylint: disable=unused-import
 
 
 from google.protobuf import timestamp_pb2