diff --git a/WORKSPACE b/WORKSPACE
index 7fbf797..17fd800 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -49,10 +49,10 @@ closure_repositories(
 )
 http_archive(
     name = "org_tensorflow_tensorboard",
-    sha256 = "09ced8f421fb9d4e73b3b0f8f44c91ee653251e7c2e2b953a4774a507c348a86",
-    strip_prefix = "tensorboard-b7dd0e369dfe51f6f08dbaf3e85fe0942dbaf64f",
+    sha256 = "1534836f297ae70d089379bc8f91e8817bd7911066bd8a93088f095bd05797e5",
+    strip_prefix = "tensorboard-dcf27c0496348349f9d905d09ed80717f421cdfe",
     urls = [
-        "https://github.com/stephanwlee/tensorboard/archive/b7dd0e369dfe51f6f08dbaf3e85fe0942dbaf64f.tar.gz",  # 2019-06-28
+        "https://github.com/stephanwlee/tensorboard/archive/dcf27c0496348349f9d905d09ed80717f421cdfe.tar.gz",  # 2019-07-12
     ],
 )
 
diff --git a/facets/BUILD b/facets/BUILD
index d18c956..f575709 100644
--- a/facets/BUILD
+++ b/facets/BUILD
@@ -14,7 +14,7 @@ tf_web_library(
     deps = [
         "//facets_dive/components/facets_dive",
         "//facets_overview/components/facets_overview",
-        "@org_tensorflow_tensorboard//tensorboard/components:polymer",
+        "@org_tensorflow_tensorboard//tensorboard/components/tf_imports:polymer",
     ],
 )
 
diff --git a/facets/visualizations.html b/facets/visualizations.html
index a3db507..500cd7f 100644
--- a/facets/visualizations.html
+++ b/facets/visualizations.html
@@ -1,3 +1,3 @@
-<link rel="import" href="../../polymer.html">
+<link rel="import" href="../../tf-imports/polymer.html">
 <link rel="import" href="../facets-overview/components/facets-overview/facets-overview.html">
 <link rel="import" href="../facets-dive/components/facets-dive/facets-dive.html">
\ No newline at end of file
diff --git a/facets_dive/components/facets_dive/facets-dive.html b/facets_dive/components/facets_dive/facets-dive.html
index 05f6fc1..01fedf5 100644
--- a/facets_dive/components/facets_dive/facets-dive.html
+++ b/facets_dive/components/facets_dive/facets-dive.html
@@ -14,7 +14,7 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<link rel="import" href="../../../polymer/polymer.html">
+<link rel="import" href="../../../tf-imports/polymer.html">
 <link rel="import" href="../../../iron-icons/iron-icons.html">
 <link rel="import" href="../../../paper-button/paper-button.html">
 <link rel="import" href="../facets-dive-controls/facets-dive-controls.html">
diff --git a/facets_dive/components/facets_dive_controls/facets-dive-controls.html b/facets_dive/components/facets_dive_controls/facets-dive-controls.html
index a8402ad..b24a180 100644
--- a/facets_dive/components/facets_dive_controls/facets-dive-controls.html
+++ b/facets_dive/components/facets_dive_controls/facets-dive-controls.html
@@ -14,7 +14,7 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<link rel="import" href="../../../polymer/polymer.html">
+<link rel="import" href="../../../tf-imports/polymer.html">
 <link rel="import" href="../../../paper-checkbox/paper-checkbox.html">
 <link rel="import" href="../../../paper-dialog/paper-dialog.html">
 <link rel="import" href="../../../paper-dropdown-menu/paper-dropdown-menu.html">
diff --git a/facets_dive/components/facets_dive_info_card/facets-dive-info-card.html b/facets_dive/components/facets_dive_info_card/facets-dive-info-card.html
index a205e7e..28c788a 100644
--- a/facets_dive/components/facets_dive_info_card/facets-dive-info-card.html
+++ b/facets_dive/components/facets_dive_info_card/facets-dive-info-card.html
@@ -14,7 +14,7 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<link rel="import" href="../../../polymer/polymer.html">
+<link rel="import" href="../../../tf-imports/polymer.html">
 <link rel="import" href="../../../paper-card/paper-card.html">
 <link rel="import" href="../../../paper-styles/typography.html">
 <link rel="import" href="../../lib/info-renderers.html">
diff --git a/facets_dive/components/facets_dive_legend/facets-dive-legend.html b/facets_dive/components/facets_dive_legend/facets-dive-legend.html
index 53b8bb1..3109519 100644
--- a/facets_dive/components/facets_dive_legend/facets-dive-legend.html
+++ b/facets_dive/components/facets_dive_legend/facets-dive-legend.html
@@ -14,7 +14,7 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<link rel="import" href="../../../polymer/polymer.html">
+<link rel="import" href="../../../tf-imports/polymer.html">
 <link rel="import" href="../../../iron-collapse/iron-collapse.html">
 <link rel="import" href="../../../iron-icons/av-icons.html">
 <link rel="import" href="../../../iron-icons/iron-icons.html">
diff --git a/facets_dive/components/facets_dive_vis/facets-dive-vis.html b/facets_dive/components/facets_dive_vis/facets-dive-vis.html
index 05bacdb..1f07ef7 100644
--- a/facets_dive/components/facets_dive_vis/facets-dive-vis.html
+++ b/facets_dive/components/facets_dive_vis/facets-dive-vis.html
@@ -14,7 +14,7 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<link rel="import" href="../../../polymer/polymer.html">
+<link rel="import" href="../../../tf-imports/polymer.html">
 <link rel="import" href="../../../iron-resizable-behavior/iron-resizable-behavior.html">
 <link rel="import" href="../../lib/axis.html">
 <link rel="import" href="../../lib/bounded-object.html">
diff --git a/facets_dive/demo/BUILD b/facets_dive/demo/BUILD
index e0631c1..4a401a6 100644
--- a/facets_dive/demo/BUILD
+++ b/facets_dive/demo/BUILD
@@ -16,8 +16,8 @@ tf_web_library(
     deps = [
         "//facets_dive/components/facets_dive",
         "//facets_dive/lib/test:externs",
-        "@org_tensorflow_tensorboard//tensorboard/components:polymer",
         "@org_tensorflow_tensorboard//tensorboard/components/tf_imports:d3",
+        "@org_tensorflow_tensorboard//tensorboard/components/tf_imports:polymer",
     ],
 )
 
diff --git a/facets_dive/demo/quickdraw.html b/facets_dive/demo/quickdraw.html
index 19a508c..1773024 100644
--- a/facets_dive/demo/quickdraw.html
+++ b/facets_dive/demo/quickdraw.html
@@ -18,7 +18,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <link rel="import" href="../../../../polymer.html">
+  <link rel="import" href="../../../../tf-imports/polymer.html">
   <link rel="import" href=".././components/facets-dive/facets-dive.html">
   <link rel="import" href="../../../../tf-imports/d3.html">
 <style>
diff --git a/facets_overview/components/facets_overview/facets-overview-filter-validator.html b/facets_overview/components/facets_overview/facets-overview-filter-validator.html
index 1a72877..e54f242 100644
--- a/facets_overview/components/facets_overview/facets-overview-filter-validator.html
+++ b/facets_overview/components/facets_overview/facets-overview-filter-validator.html
@@ -14,7 +14,7 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<link rel="import" href="../../../polymer/polymer.html">
+<link rel="import" href="../../../tf-imports/polymer.html">
 <link rel="import" href="../../../iron-validator-behavior/iron-validator-behavior.html">
 
 <script>
diff --git a/facets_overview/components/facets_overview/facets-overview.html b/facets_overview/components/facets_overview/facets-overview.html
index e43f9a1..54c3ebc 100644
--- a/facets_overview/components/facets_overview/facets-overview.html
+++ b/facets_overview/components/facets_overview/facets-overview.html
@@ -14,7 +14,7 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<link rel="import" href="../../../polymer/polymer.html">
+<link rel="import" href="../../../tf-imports/polymer.html">
 <link rel="import" href="../../../paper-checkbox/paper-checkbox.html">
 <link rel="import" href="../../../paper-dropdown-menu/paper-dropdown-menu.html">
 <link rel="import" href="../../../paper-listbox/paper-listbox.html">
diff --git a/facets_overview/components/facets_overview_chart/facets-overview-chart.html b/facets_overview/components/facets_overview_chart/facets-overview-chart.html
index 5493c6d..8b617e1 100644
--- a/facets_overview/components/facets_overview_chart/facets-overview-chart.html
+++ b/facets_overview/components/facets_overview_chart/facets-overview-chart.html
@@ -14,7 +14,7 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<link rel="import" href="../../../polymer/polymer.html">
+<link rel="import" href="../../../tf-imports/polymer.html">
 <link rel="import" href="../../../iron-list/iron-list.html">
 <link rel="import" href="../../../paper-button/paper-button.html">
 <link rel="import" href="../../../paper-checkbox/paper-checkbox.html">
diff --git a/facets_overview/components/facets_overview_row_legend/facets-overview-row-legend.html b/facets_overview/components/facets_overview_row_legend/facets-overview-row-legend.html
index 357fbda..7f090c9 100644
--- a/facets_overview/components/facets_overview_row_legend/facets-overview-row-legend.html
+++ b/facets_overview/components/facets_overview_row_legend/facets-overview-row-legend.html
@@ -14,7 +14,7 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<link rel="import" href="../../../polymer/polymer.html">
+<link rel="import" href="../../../tf-imports/polymer.html">
 <link rel="import" href="../../common/common_bundle.html">
 
 <dom-module id='facets-overview-row-legend'>
diff --git a/facets_overview/components/facets_overview_row_stats/facets-overview-row-stats.html b/facets_overview/components/facets_overview_row_stats/facets-overview-row-stats.html
index cf17a4f..4779f39 100644
--- a/facets_overview/components/facets_overview_row_stats/facets-overview-row-stats.html
+++ b/facets_overview/components/facets_overview_row_stats/facets-overview-row-stats.html
@@ -14,7 +14,7 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<link rel="import" href="../../../polymer/polymer.html">
+<link rel="import" href="../../../tf-imports/polymer.html">
 <link rel="import" href="../../common/common_bundle.html">
 
 <dom-module id='facets-overview-row-stats'>
diff --git a/facets_overview/components/facets_overview_table/facets-overview-table.html b/facets_overview/components/facets_overview_table/facets-overview-table.html
index f7b27c7..8e49e6f 100644
--- a/facets_overview/components/facets_overview_table/facets-overview-table.html
+++ b/facets_overview/components/facets_overview_table/facets-overview-table.html
@@ -14,7 +14,7 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<link rel="import" href="../../../polymer/polymer.html">
+<link rel="import" href="../../../tf-imports/polymer.html">
 <link rel="import" href="../../../iron-list/iron-list.html">
 <link rel="import" href="../../../paper-dropdown-menu/paper-dropdown-menu.html">
 <link rel="import" href="../../../paper-item/paper-item.html">
diff --git a/facets_overview/functional_tests/many/BUILD b/facets_overview/functional_tests/many/BUILD
index 5ad5572..371ceae 100644
--- a/facets_overview/functional_tests/many/BUILD
+++ b/facets_overview/functional_tests/many/BUILD
@@ -32,8 +32,8 @@ tf_web_library(
         "//facets_overview/functional_tests/test_helpers",
         "//facets_overview/proto:feature_statistics_closure_proto",
         "@org_polymer_iron_demo_helpers",
-        "@org_tensorflow_tensorboard//tensorboard/components:polymer",
         "@org_tensorflow_tensorboard//tensorboard/components/tf_imports:d3",
+        "@org_tensorflow_tensorboard//tensorboard/components/tf_imports:polymer",
     ],
 )
 
diff --git a/facets_overview/functional_tests/many/index.html b/facets_overview/functional_tests/many/index.html
index e5359b2..9cfff83 100644
--- a/facets_overview/functional_tests/many/index.html
+++ b/facets_overview/functional_tests/many/index.html
@@ -19,7 +19,7 @@
   <head>
     <meta charset="utf-8">
     <title>Overview Test</title>
-    <link rel="import" href="../../../polymer.html">
+    <link rel="import" href="../../../tf-imports/polymer.html">
     <link rel="import" href="../../../iron-demo-helpers/demo-snippet.html">
     <link rel="import" href="many-test.html">
     <style>
diff --git a/facets_overview/functional_tests/simple/BUILD b/facets_overview/functional_tests/simple/BUILD
index 424967c..beb8c9a 100644
--- a/facets_overview/functional_tests/simple/BUILD
+++ b/facets_overview/functional_tests/simple/BUILD
@@ -32,8 +32,8 @@ tf_web_library(
         "//facets_overview/functional_tests/test_helpers",
         "//facets_overview/proto:feature_statistics_closure_proto",
         "@org_polymer_iron_demo_helpers",
-        "@org_tensorflow_tensorboard//tensorboard/components:polymer",
         "@org_tensorflow_tensorboard//tensorboard/components/tf_imports:d3",
+        "@org_tensorflow_tensorboard//tensorboard/components/tf_imports:polymer",
     ],
 )
 
diff --git a/facets_overview/functional_tests/simple/index.html b/facets_overview/functional_tests/simple/index.html
index 0f6c6a8..b7d95b9 100644
--- a/facets_overview/functional_tests/simple/index.html
+++ b/facets_overview/functional_tests/simple/index.html
@@ -19,7 +19,7 @@
   <head>
     <meta charset="utf-8">
     <title>Overview Test</title>
-    <link rel="import" href="../../../polymer.html">
+    <link rel="import" href="../../../tf-imports/polymer.html">
     <link rel="import" href="../../../iron-demo-helpers/demo-snippet.html">
     <link rel="import" href="simple-test.html">
     <style>
diff --git a/facets_overview/functional_tests/single/BUILD b/facets_overview/functional_tests/single/BUILD
index 80dcc62..064fae3 100644
--- a/facets_overview/functional_tests/single/BUILD
+++ b/facets_overview/functional_tests/single/BUILD
@@ -32,8 +32,8 @@ tf_web_library(
         "//facets_overview/functional_tests/test_helpers",
         "//facets_overview/proto:feature_statistics_closure_proto",
         "@org_polymer_iron_demo_helpers",
-        "@org_tensorflow_tensorboard//tensorboard/components:polymer",
         "@org_tensorflow_tensorboard//tensorboard/components/tf_imports:d3",
+        "@org_tensorflow_tensorboard//tensorboard/components/tf_imports:polymer",
     ],
 )
 
diff --git a/facets_overview/functional_tests/single/index.html b/facets_overview/functional_tests/single/index.html
index bbf9e7a..61c6f73 100644
--- a/facets_overview/functional_tests/single/index.html
+++ b/facets_overview/functional_tests/single/index.html
@@ -19,7 +19,7 @@
   <head>
     <meta charset="utf-8">
     <title>Overview Test</title>
-    <link rel="import" href="../../../polymer.html">
+    <link rel="import" href="../../../tf-imports/polymer.html">
     <link rel="import" href="../../../iron-demo-helpers/demo-snippet.html">
     <link rel="import" href="single-test.html">
     <style>
diff --git a/facets_overview/functional_tests/single_feature/BUILD b/facets_overview/functional_tests/single_feature/BUILD
index 1bb38e6..f1b6aba 100644
--- a/facets_overview/functional_tests/single_feature/BUILD
+++ b/facets_overview/functional_tests/single_feature/BUILD
@@ -32,8 +32,8 @@ tf_web_library(
         "//facets_overview/functional_tests/test_helpers",
         "//facets_overview/proto:feature_statistics_closure_proto",
         "@org_polymer_iron_demo_helpers",
-        "@org_tensorflow_tensorboard//tensorboard/components:polymer",
         "@org_tensorflow_tensorboard//tensorboard/components/tf_imports:d3",
+        "@org_tensorflow_tensorboard//tensorboard/components/tf_imports:polymer",
     ],
 )
 
diff --git a/facets_overview/functional_tests/single_feature/index.html b/facets_overview/functional_tests/single_feature/index.html
index 5ce58dd..9ea448e 100644
--- a/facets_overview/functional_tests/single_feature/index.html
+++ b/facets_overview/functional_tests/single_feature/index.html
@@ -19,7 +19,7 @@
   <head>
     <meta charset="utf-8">
     <title>Overview Test</title>
-    <link rel="import" href="../../../polymer.html">
+    <link rel="import" href="../../../tf-imports/polymer.html">
     <link rel="import" href="../../../iron-demo-helpers/demo-snippet.html">
     <link rel="import" href="single-feature-test.html">
     <style>
diff --git a/facets_overview/functional_tests/stress/BUILD b/facets_overview/functional_tests/stress/BUILD
index 744dc26..c9da253 100644
--- a/facets_overview/functional_tests/stress/BUILD
+++ b/facets_overview/functional_tests/stress/BUILD
@@ -32,8 +32,8 @@ tf_web_library(
         "//facets_overview/functional_tests/test_helpers",
         "//facets_overview/proto:feature_statistics_closure_proto",
         "@org_polymer_iron_demo_helpers",
-        "@org_tensorflow_tensorboard//tensorboard/components:polymer",
         "@org_tensorflow_tensorboard//tensorboard/components/tf_imports:d3",
+        "@org_tensorflow_tensorboard//tensorboard/components/tf_imports:polymer",
     ],
 )
 
diff --git a/facets_overview/functional_tests/stress/index.html b/facets_overview/functional_tests/stress/index.html
index 333764a..05d09f6 100644
--- a/facets_overview/functional_tests/stress/index.html
+++ b/facets_overview/functional_tests/stress/index.html
@@ -19,7 +19,7 @@
   <head>
     <meta charset="utf-8">
     <title>Overview Stress Test</title>
-    <link rel="import" href="../../../polymer.html">
+    <link rel="import" href="../../../tf-imports/polymer.html">
     <link rel="import" href="../../../iron-demo-helpers/demo-snippet.html">
     <link rel="import" href="stress-test.html">
     <style>
diff --git a/facets_overview/functional_tests/weighted/BUILD b/facets_overview/functional_tests/weighted/BUILD
index 701ba67..17c5281 100644
--- a/facets_overview/functional_tests/weighted/BUILD
+++ b/facets_overview/functional_tests/weighted/BUILD
@@ -32,8 +32,8 @@ tf_web_library(
         "//facets_overview/functional_tests/test_helpers",
         "//facets_overview/proto:feature_statistics_closure_proto",
         "@org_polymer_iron_demo_helpers",
-        "@org_tensorflow_tensorboard//tensorboard/components:polymer",
         "@org_tensorflow_tensorboard//tensorboard/components/tf_imports:d3",
+        "@org_tensorflow_tensorboard//tensorboard/components/tf_imports:polymer",
     ],
 )
 
diff --git a/facets_overview/functional_tests/weighted/index.html b/facets_overview/functional_tests/weighted/index.html
index 79ca394..f410ac4 100644
--- a/facets_overview/functional_tests/weighted/index.html
+++ b/facets_overview/functional_tests/weighted/index.html
@@ -19,7 +19,7 @@
   <head>
     <meta charset="utf-8">
     <title>Overview Test</title>
-    <link rel="import" href="../../../polymer.html">
+    <link rel="import" href="../../../tf-imports/polymer.html">
     <link rel="import" href="../../../iron-demo-helpers/demo-snippet.html">
     <link rel="import" href="weighted-test.html">
     <style>