diff --git a/tensorboard/components/BUILD b/tensorboard/components/BUILD
index d9d44bb6ab5..4d323337a2e 100644
--- a/tensorboard/components/BUILD
+++ b/tensorboard/components/BUILD
@@ -6,10 +6,8 @@ load("//tensorboard/defs:vulcanize.bzl", "tensorboard_html_binary")
 licenses(["notice"])  # Apache 2.0
 
 tf_web_library(
-    name = "polymer_lib",
-    srcs = [
-        "polymer_lib.html",
-    ],
+    name = "tensorboard",
+    srcs = ["tensorboard.html"],
     path = "/",
     deps = [
         ":analytics",
@@ -19,27 +17,9 @@ tf_web_library(
     ],
 )
 
-# This Polymer only binary without entry point.
-tensorboard_html_binary(
-    name = "polymer_lib_binary",
-    compile = True,
-    input_path = "/polymer_lib.html",
-    output_path = "/polymer_lib_binary.html",
-    deps = [":polymer_lib"],
-)
-
-tf_web_library(
-    name = "tensorboard",
-    srcs = ["tensorboard.html"],
-    path = "/",
-    deps = [
-        ":polymer_lib_binary",
-    ],
-)
-
 tensorboard_html_binary(
     name = "index",
-    compile = False,
+    compile = True,
     input_path = "/tensorboard.html",
     js_path = "/index.js",
     output_path = "/index.html",
@@ -69,3 +49,32 @@ tf_web_library(
     ],
     path = "/",
 )
+
+tf_web_library(
+    name = "ng_polymer_lib",
+    srcs = [
+        "ng_polymer_lib.html",
+    ],
+    path = "/",
+    deps = [
+        ":analytics",
+        ":security",
+        "//tensorboard/components/tf_backend",
+        "//tensorboard/components/tf_imports:polymer",
+        "//tensorboard/components/tf_storage",
+        "//tensorboard/components/tf_tensorboard",
+        "//tensorboard/components/tf_tensorboard:default_plugins",
+        "//tensorboard/components/tf_tensorboard:registry",
+    ],
+)
+
+# This Polymer only binary (as opposed to ng_index) allows ng_index to be built without
+# JSCompiler step. In other words, Angular-only changes can be built faster
+# incrementally.
+tensorboard_html_binary(
+    name = "ng_polymer_lib_binary",
+    compile = False,
+    input_path = "/ng_polymer_lib.html",
+    output_path = "/ng_polymer_lib_binary.html",
+    deps = [":ng_polymer_lib"],
+)
diff --git a/tensorboard/components/polymer_lib.html b/tensorboard/components/ng_polymer_lib.html
similarity index 78%
rename from tensorboard/components/polymer_lib.html
rename to tensorboard/components/ng_polymer_lib.html
index 694edfeea31..38b3ed89790 100644
--- a/tensorboard/components/polymer_lib.html
+++ b/tensorboard/components/ng_polymer_lib.html
@@ -15,12 +15,12 @@
 limitations under the License.
 -->
 <!-- Configures polymer and requires to be loaded at the top. -->
-<!-- TODO(stephanwlee): Hparams (vaadin-grid) cannot support strictTemplatePolciy. Figure out
-how to enable it back. -->
-<!-- <link rel="import" href="security.html" /> -->
+<link rel="import" href="security.html" />
 
 <link rel="import" href="analytics.html" />
 <link rel="import" href="tf-imports/polymer.html" />
+<link rel="import" href="tf-tensorboard/registry.html" />
 <link rel="import" href="tf-tensorboard/style.html" />
+<link rel="import" href="tf-backend/tf-backend.html" />
+<link rel="import" href="tf-storage/tf-storage.html" />
 <link rel="import" href="tf-tensorboard/default-plugins.html" />
-<link rel="import" href="tf-tensorboard/tf-tensorboard.html" />
diff --git a/tensorboard/components/tensorboard.uninlined.html b/tensorboard/components/tensorboard.uninlined.html
index 060c6e086b7..23b16f56443 100644
--- a/tensorboard/components/tensorboard.uninlined.html
+++ b/tensorboard/components/tensorboard.uninlined.html
@@ -22,7 +22,16 @@
   <link rel="shortcut icon" href="%TENSORBOARD_FAVICON_URI%" />
   <link rel="apple-touch-icon" href="%TENSORBOARD_FAVICON_URI%" />
 
-  <link rel="import" href="polymer_lib_binary.html" />
+  <!-- Configures polymer and requires to be loaded at the top. -->
+  <!-- TODO(stephanwlee): Hparams (vaadin-grid) cannot support strictTemplatePolciy. Figure out
+how to enable it back. -->
+  <!-- <link rel="import" href="security.html" /> -->
+
+  <link rel="import" href="analytics.html" />
+  <link rel="import" href="tf-imports/polymer.html" />
+  <link rel="import" href="tf-tensorboard/style.html" />
+  <link rel="import" href="tf-tensorboard/default-plugins.html" />
+  <link rel="import" href="tf-tensorboard/tf-tensorboard.html" />
   <body>
     <tf-tensorboard use-hash brand="TensorBoard"></tf-tensorboard>
   </body>
diff --git a/tensorboard/webapp/BUILD b/tensorboard/webapp/BUILD
index 8c8890766b4..fb4fcdac1a7 100644
--- a/tensorboard/webapp/BUILD
+++ b/tensorboard/webapp/BUILD
@@ -110,7 +110,7 @@ tf_web_library(
     path = "/",
     deps = [
         ":tb_webapp",
-        "//tensorboard/components:polymer_lib_binary",
+        "//tensorboard/components:ng_polymer_lib_binary",
         "//tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/source_code/monaco:requirejs",
     ],
 )
diff --git a/tensorboard/webapp/index.uninlined.html b/tensorboard/webapp/index.uninlined.html
index 4acdf9c8f0d..50321bafb58 100644
--- a/tensorboard/webapp/index.uninlined.html
+++ b/tensorboard/webapp/index.uninlined.html
@@ -20,7 +20,7 @@
 <link rel="shortcut icon" href="%TENSORBOARD_FAVICON_URI%" />
 <link rel="apple-touch-icon" href="%TENSORBOARD_FAVICON_URI%" />
 
-<link rel="import" href="polymer_lib_binary.html" />
+<link rel="import" href="ng_polymer_lib_binary.html" />
 <link rel="stylesheet" href="styles.css" />
 
 <body>