diff --git a/chrome/browser/resources/chromeos/emulator/audio_settings.html b/chrome/browser/resources/chromeos/emulator/audio_settings.html
index 688da483c1612..d633a9330df7b 100644
--- a/chrome/browser/resources/chromeos/emulator/audio_settings.html
+++ b/chrome/browser/resources/chromeos/emulator/audio_settings.html
@@ -14,9 +14,8 @@
 
 <dom-module id="audio-settings">
   <template>
-    <!-- TODO(michaelpg): Wrap the line below to fit within the 80-char limit.
-         See https://github.com/Polymer/polymer/pull/3668. -->
-    <style include="device-emulator-shared-styles cr-shared-style iron-flex iron-flex-alignment iron-positioning">
+    <style include="device-emulator-shared-styles cr-shared-style iron-flex
+        iron-flex-alignment iron-positioning">
     </style>
     <dialog is="cr-dialog" id="editDialog">
       <div slot="title">[[currentEditableObject.deviceName]]</div>
diff --git a/chrome/browser/resources/chromeos/emulator/battery_settings.html b/chrome/browser/resources/chromeos/emulator/battery_settings.html
index 8454f6bfaaf43..1889b1c5459c8 100644
--- a/chrome/browser/resources/chromeos/emulator/battery_settings.html
+++ b/chrome/browser/resources/chromeos/emulator/battery_settings.html
@@ -13,8 +13,6 @@
 
 <dom-module id="battery-settings">
   <template>
-    <!-- TODO(michaelpg): Wrap the line below to fit within the 80-char limit.
-         See https://github.com/Polymer/polymer/pull/3668. -->
     <style include="device-emulator-shared-styles iron-flex iron-flex-alignment
         iron-positioning md-select">
     </style>
diff --git a/chrome/browser/resources/chromeos/emulator/bluetooth_settings.html b/chrome/browser/resources/chromeos/emulator/bluetooth_settings.html
index 5389e248b2766..9bc4a1dba1168 100644
--- a/chrome/browser/resources/chromeos/emulator/bluetooth_settings.html
+++ b/chrome/browser/resources/chromeos/emulator/bluetooth_settings.html
@@ -14,9 +14,8 @@
 
 <dom-module id="bluetooth-settings">
   <template>
-    <!-- TODO(michaelpg): Wrap the line below to fit within the 80-char limit.
-         See https://github.com/Polymer/polymer/pull/3668. -->
-    <style include="device-emulator-shared-styles cr-shared-style iron-flex iron-flex-alignment iron-positioning">
+    <style include="device-emulator-shared-styles cr-shared-style iron-flex
+        iron-flex-alignment iron-positioning">
     </style>
     <dialog is="cr-dialog" id="editDialog">
       <div slot="title">[[currentEditableObject.alias]]</div>
diff --git a/chrome/browser/resources/chromeos/emulator/device_emulator_pages.html b/chrome/browser/resources/chromeos/emulator/device_emulator_pages.html
index 9d876d3bcfd6e..e2abe2d524351 100644
--- a/chrome/browser/resources/chromeos/emulator/device_emulator_pages.html
+++ b/chrome/browser/resources/chromeos/emulator/device_emulator_pages.html
@@ -21,9 +21,8 @@
 
 <dom-module id="device-emulator-pages">
   <template>
-    <!-- TODO(michaelpg): Wrap the line below to fit within the 80-char limit.
-         See https://github.com/Polymer/polymer/pull/3668. -->
-    <style include="device-emulator-shared-styles iron-flex iron-flex-alignment iron-positioning">
+    <style include="device-emulator-shared-styles iron-flex iron-flex-alignment
+        iron-positioning">
       :host {
         display: flex;
         flex-direction: column;
diff --git a/chrome/browser/resources/chromeos/emulator/input_device_settings.html b/chrome/browser/resources/chromeos/emulator/input_device_settings.html
index 871e31e50b7ce..872655107dc77 100644
--- a/chrome/browser/resources/chromeos/emulator/input_device_settings.html
+++ b/chrome/browser/resources/chromeos/emulator/input_device_settings.html
@@ -7,9 +7,8 @@
 
 <dom-module id="input-device-settings">
   <template>
-    <!-- TODO(michaelpg): Wrap the line below to fit within the 80-char limit.
-         See https://github.com/Polymer/polymer/pull/3668. -->
-    <style include="device-emulator-shared-styles iron-flex iron-flex-alignment iron-positioning">
+    <style include="device-emulator-shared-styles iron-flex iron-flex-alignment
+         iron-positioning">
       .content > *:not(:first-child) {
         margin-top: 10px;
       }
diff --git a/chrome/browser/resources/md_extensions/detail_view.html b/chrome/browser/resources/md_extensions/detail_view.html
index 4b8b86b18084c..06733dc074157 100644
--- a/chrome/browser/resources/md_extensions/detail_view.html
+++ b/chrome/browser/resources/md_extensions/detail_view.html
@@ -25,7 +25,8 @@
 
 <dom-module id="extensions-detail-view">
   <template>
-    <style include="iron-flex cr-shared-style cr-icons action-link paper-button-style">
+    <style include="iron-flex cr-shared-style cr-icons action-link
+        paper-button-style">
       :host {
         --iron-icon-fill-color: var(--paper-grey-600);
         display: block;
@@ -181,8 +182,8 @@
       }
 
       #size {
-        display: flex;
         align-items: center;
+        display: flex;
       }
 
       paper-spinner-lite {
diff --git a/chrome/browser/resources/settings/internet_page/network_proxy_section.html b/chrome/browser/resources/settings/internet_page/network_proxy_section.html
index f5d88e89c417a..4d4ee9d486189 100644
--- a/chrome/browser/resources/settings/internet_page/network_proxy_section.html
+++ b/chrome/browser/resources/settings/internet_page/network_proxy_section.html
@@ -20,7 +20,8 @@
 
 <dom-module id="network-proxy-section">
   <template>
-    <style include="internet-shared cr-hidden-style iron-flex iron-flex-alignment">
+    <style include="internet-shared cr-hidden-style iron-flex
+       iron-flex-alignment">
       cr-policy-network-indicator {
         -webkit-margin-end: 10px;
       }
diff --git a/chrome/browser/resources/settings/settings_shared_css.html b/chrome/browser/resources/settings/settings_shared_css.html
index 36f43725cd76d..024f5f2e2dfc0 100644
--- a/chrome/browser/resources/settings/settings_shared_css.html
+++ b/chrome/browser/resources/settings/settings_shared_css.html
@@ -11,7 +11,8 @@
 <!-- Common styles for Material Design settings. -->
 <dom-module id="settings-shared">
   <template>
-    <style include="settings-icons paper-button-style paper-checkbox-style paper-input-style paper-toggle-style cr-shared-style">
+    <style include="settings-icons paper-button-style paper-checkbox-style
+        paper-input-style paper-toggle-style cr-shared-style">
       /* Prevent action-links from being selected to avoid accidental
        * selection when trying to click it. */
       a[is=action-link] {