diff --git a/closure/goog/db/error.js b/closure/goog/db/error.js
index 61b61c1821..55bb9b6825 100644
--- a/closure/goog/db/error.js
+++ b/closure/goog/db/error.js
@@ -18,6 +18,15 @@
  */
 
 
+
+// TODO(b/130421259): We're trying to migrate all ES5 subclasses of Closure
+// Library to ES6. In ES6 this cannot be referenced before super is called. This
+// file has at least one this before a super call (in ES5) and cannot be
+// automatically upgraded to ES6 as a result. Please fix this if you have a
+// chance. Note: This can sometimes be caused by not calling the super
+// constructor at all. You can run the conversion tool yourself to see what it
+// does on this file: blaze run //javascript/refactoring/es6_classes:convert.
+
 goog.provide('goog.db.DomErrorLike');
 goog.provide('goog.db.Error');
 goog.provide('goog.db.Error.ErrorCode');
diff --git a/closure/goog/debug/fancywindow.js b/closure/goog/debug/fancywindow.js
index 29e0e705c3..affb8eec13 100644
--- a/closure/goog/debug/fancywindow.js
+++ b/closure/goog/debug/fancywindow.js
@@ -24,6 +24,15 @@
  */
 
 
+
+// TODO(b/130421259): We're trying to migrate all ES5 subclasses of Closure
+// Library to ES6. In ES6 this cannot be referenced before super is called. This
+// file has at least one this before a super call (in ES5) and cannot be
+// automatically upgraded to ES6 as a result. Please fix this if you have a
+// chance. Note: This can sometimes be caused by not calling the super
+// constructor at all. You can run the conversion tool yourself to see what it
+// does on this file: blaze run //javascript/refactoring/es6_classes:convert.
+
 goog.provide('goog.debug.FancyWindow');
 
 goog.require('goog.array');
diff --git a/closure/goog/demos/editor/helloworlddialog.js b/closure/goog/demos/editor/helloworlddialog.js
index 87fdbb3342..d585165a4e 100644
--- a/closure/goog/demos/editor/helloworlddialog.js
+++ b/closure/goog/demos/editor/helloworlddialog.js
@@ -17,6 +17,15 @@
  *
  */
 
+
+// TODO(b/130421259): We're trying to migrate all ES5 subclasses of Closure
+// Library to ES6. In ES6 this cannot be referenced before super is called. This
+// file has at least one this before a super call (in ES5) and cannot be
+// automatically upgraded to ES6 as a result. Please fix this if you have a
+// chance. Note: This can sometimes be caused by not calling the super
+// constructor at all. You can run the conversion tool yourself to see what it
+// does on this file: blaze run //javascript/refactoring/es6_classes:convert.
+
 goog.provide('goog.demos.editor.HelloWorldDialog');
 goog.provide('goog.demos.editor.HelloWorldDialog.OkEvent');
 
diff --git a/closure/goog/dom/controlrange.js b/closure/goog/dom/controlrange.js
index 7164e111f1..7193063e5e 100644
--- a/closure/goog/dom/controlrange.js
+++ b/closure/goog/dom/controlrange.js
@@ -20,6 +20,15 @@
  */
 
 
+
+// TODO(b/130421259): We're trying to migrate all ES5 subclasses of Closure
+// Library to ES6. In ES6 this cannot be referenced before super is called. This
+// file has at least one this before a super call (in ES5) and cannot be
+// automatically upgraded to ES6 as a result. Please fix this if you have a
+// chance. Note: This can sometimes be caused by not calling the super
+// constructor at all. You can run the conversion tool yourself to see what it
+// does on this file: blaze run //javascript/refactoring/es6_classes:convert.
+
 goog.provide('goog.dom.ControlRange');
 goog.provide('goog.dom.ControlRangeIterator');
 
diff --git a/closure/goog/dom/multirange.js b/closure/goog/dom/multirange.js
index ac4a32eb80..c6a04f3213 100644
--- a/closure/goog/dom/multirange.js
+++ b/closure/goog/dom/multirange.js
@@ -19,6 +19,15 @@
  */
 
 
+
+// TODO(b/130421259): We're trying to migrate all ES5 subclasses of Closure
+// Library to ES6. In ES6 this cannot be referenced before super is called. This
+// file has at least one this before a super call (in ES5) and cannot be
+// automatically upgraded to ES6 as a result. Please fix this if you have a
+// chance. Note: This can sometimes be caused by not calling the super
+// constructor at all. You can run the conversion tool yourself to see what it
+// does on this file: blaze run //javascript/refactoring/es6_classes:convert.
+
 goog.provide('goog.dom.MultiRange');
 goog.provide('goog.dom.MultiRangeIterator');
 
diff --git a/closure/goog/dom/pattern/childmatches.js b/closure/goog/dom/pattern/childmatches.js
index d85bed6dd3..9f64769109 100644
--- a/closure/goog/dom/pattern/childmatches.js
+++ b/closure/goog/dom/pattern/childmatches.js
@@ -19,6 +19,15 @@
  * @author robbyw@google.com (Robby Walker)
  */
 
+
+// TODO(b/130421259): We're trying to migrate all ES5 subclasses of Closure
+// Library to ES6. In ES6 this cannot be referenced before super is called. This
+// file has at least one this before a super call (in ES5) and cannot be
+// automatically upgraded to ES6 as a result. Please fix this if you have a
+// chance. Note: This can sometimes be caused by not calling the super
+// constructor at all. You can run the conversion tool yourself to see what it
+// does on this file: blaze run //javascript/refactoring/es6_classes:convert.
+
 goog.provide('goog.dom.pattern.ChildMatches');
 
 goog.require('goog.dom.pattern.AllChildren');
diff --git a/closure/goog/dom/pattern/fulltag.js b/closure/goog/dom/pattern/fulltag.js
index 124a90bdac..4f86c06f27 100644
--- a/closure/goog/dom/pattern/fulltag.js
+++ b/closure/goog/dom/pattern/fulltag.js
@@ -18,6 +18,15 @@
  * @author robbyw@google.com (Robby Walker)
  */
 
+
+// TODO(b/130421259): We're trying to migrate all ES5 subclasses of Closure
+// Library to ES6. In ES6 this cannot be referenced before super is called. This
+// file has at least one this before a super call (in ES5) and cannot be
+// automatically upgraded to ES6 as a result. Please fix this if you have a
+// chance. Note: This can sometimes be caused by not calling the super
+// constructor at all. You can run the conversion tool yourself to see what it
+// does on this file: blaze run //javascript/refactoring/es6_classes:convert.
+
 goog.provide('goog.dom.pattern.FullTag');
 
 goog.require('goog.dom.pattern.MatchType');
diff --git a/closure/goog/dom/textrangeiterator.js b/closure/goog/dom/textrangeiterator.js
index a28fee65bf..6979d8f4f1 100644
--- a/closure/goog/dom/textrangeiterator.js
+++ b/closure/goog/dom/textrangeiterator.js
@@ -18,6 +18,15 @@
  * @author robbyw@google.com (Robby Walker)
  */
 
+
+// TODO(b/130421259): We're trying to migrate all ES5 subclasses of Closure
+// Library to ES6. In ES6 this cannot be referenced before super is called. This
+// file has at least one this before a super call (in ES5) and cannot be
+// automatically upgraded to ES6 as a result. Please fix this if you have a
+// chance. Note: This can sometimes be caused by not calling the super
+// constructor at all. You can run the conversion tool yourself to see what it
+// does on this file: blaze run //javascript/refactoring/es6_classes:convert.
+
 goog.provide('goog.dom.TextRangeIterator');
 
 goog.require('goog.array');
diff --git a/closure/goog/fs/error.js b/closure/goog/fs/error.js
index 8c7dbe6d56..8abb39c156 100644
--- a/closure/goog/fs/error.js
+++ b/closure/goog/fs/error.js
@@ -17,6 +17,15 @@
  *
  */
 
+
+// TODO(b/130421259): We're trying to migrate all ES5 subclasses of Closure
+// Library to ES6. In ES6 this cannot be referenced before super is called. This
+// file has at least one this before a super call (in ES5) and cannot be
+// automatically upgraded to ES6 as a result. Please fix this if you have a
+// chance. Note: This can sometimes be caused by not calling the super
+// constructor at all. You can run the conversion tool yourself to see what it
+// does on this file: blaze run //javascript/refactoring/es6_classes:convert.
+
 goog.provide('goog.fs.DOMErrorLike');
 goog.provide('goog.fs.Error');
 goog.provide('goog.fs.Error.ErrorCode');
diff --git a/closure/goog/graphics/ext/graphics.js b/closure/goog/graphics/ext/graphics.js
index 9f68711fe8..d1aba0fb78 100644
--- a/closure/goog/graphics/ext/graphics.js
+++ b/closure/goog/graphics/ext/graphics.js
@@ -19,6 +19,15 @@
  */
 
 
+
+// TODO(b/130421259): We're trying to migrate all ES5 subclasses of Closure
+// Library to ES6. In ES6 this cannot be referenced before super is called. This
+// file has at least one this before a super call (in ES5) and cannot be
+// automatically upgraded to ES6 as a result. Please fix this if you have a
+// chance. Note: This can sometimes be caused by not calling the super
+// constructor at all. You can run the conversion tool yourself to see what it
+// does on this file: blaze run //javascript/refactoring/es6_classes:convert.
+
 goog.provide('goog.graphics.ext.Graphics');
 
 goog.require('goog.events');
diff --git a/closure/goog/graphics/ext/shape.js b/closure/goog/graphics/ext/shape.js
index daab69415f..a043ec5517 100644
--- a/closure/goog/graphics/ext/shape.js
+++ b/closure/goog/graphics/ext/shape.js
@@ -19,6 +19,15 @@
  */
 
 
+
+// TODO(b/130421259): We're trying to migrate all ES5 subclasses of Closure
+// Library to ES6. In ES6 this cannot be referenced before super is called. This
+// file has at least one this before a super call (in ES5) and cannot be
+// automatically upgraded to ES6 as a result. Please fix this if you have a
+// chance. Note: This can sometimes be caused by not calling the super
+// constructor at all. You can run the conversion tool yourself to see what it
+// does on this file: blaze run //javascript/refactoring/es6_classes:convert.
+
 goog.provide('goog.graphics.ext.Shape');
 
 goog.require('goog.graphics.ext.StrokeAndFillElement');
diff --git a/closure/goog/graphics/vmlelement.js b/closure/goog/graphics/vmlelement.js
index 3bc0ba9e50..4b6668e99c 100644
--- a/closure/goog/graphics/vmlelement.js
+++ b/closure/goog/graphics/vmlelement.js
@@ -19,6 +19,15 @@
  * @author arv@google.com (Erik Arvidsson)
  */
 
+
+// TODO(b/130421259): We're trying to migrate all ES5 subclasses of Closure
+// Library to ES6. In ES6 this cannot be referenced before super is called. This
+// file has at least one this before a super call (in ES5) and cannot be
+// automatically upgraded to ES6 as a result. Please fix this if you have a
+// chance. Note: This can sometimes be caused by not calling the super
+// constructor at all. You can run the conversion tool yourself to see what it
+// does on this file: blaze run //javascript/refactoring/es6_classes:convert.
+
 goog.provide('goog.graphics.VmlEllipseElement');
 goog.provide('goog.graphics.VmlGroupElement');
 goog.provide('goog.graphics.VmlImageElement');
diff --git a/closure/goog/labs/format/csv.js b/closure/goog/labs/format/csv.js
index e6ccfa20a6..36d70f0221 100644
--- a/closure/goog/labs/format/csv.js
+++ b/closure/goog/labs/format/csv.js
@@ -22,6 +22,15 @@
  *
  * @author nnaze@google.com (Nathan Naze) Ported to Closure
  */
+
+// TODO(b/130421259): We're trying to migrate all ES5 subclasses of Closure
+// Library to ES6. In ES6 this cannot be referenced before super is called. This
+// file has at least one this before a super call (in ES5) and cannot be
+// automatically upgraded to ES6 as a result. Please fix this if you have a
+// chance. Note: This can sometimes be caused by not calling the super
+// constructor at all. You can run the conversion tool yourself to see what it
+// does on this file: blaze run //javascript/refactoring/es6_classes:convert.
+
 goog.provide('goog.labs.format.csv');
 goog.provide('goog.labs.format.csv.ParseError');
 goog.provide('goog.labs.format.csv.Token');
diff --git a/closure/goog/net/ipaddress.js b/closure/goog/net/ipaddress.js
index bf1e44b83a..42c970034c 100644
--- a/closure/goog/net/ipaddress.js
+++ b/closure/goog/net/ipaddress.js
@@ -19,6 +19,15 @@
  *
  */
 
+
+// TODO(b/130421259): We're trying to migrate all ES5 subclasses of Closure
+// Library to ES6. In ES6 this cannot be referenced before super is called. This
+// file has at least one this before a super call (in ES5) and cannot be
+// automatically upgraded to ES6 as a result. Please fix this if you have a
+// chance. Note: This can sometimes be caused by not calling the super
+// constructor at all. You can run the conversion tool yourself to see what it
+// does on this file: blaze run //javascript/refactoring/es6_classes:convert.
+
 goog.provide('goog.net.IpAddress');
 goog.provide('goog.net.Ipv4Address');
 goog.provide('goog.net.Ipv6Address');
diff --git a/closure/goog/storage/mechanism/ieuserdata.js b/closure/goog/storage/mechanism/ieuserdata.js
index 4b0c6289f3..276687cbe9 100644
--- a/closure/goog/storage/mechanism/ieuserdata.js
+++ b/closure/goog/storage/mechanism/ieuserdata.js
@@ -20,6 +20,15 @@
  *
  */
 
+
+// TODO(b/130421259): We're trying to migrate all ES5 subclasses of Closure
+// Library to ES6. In ES6 this cannot be referenced before super is called. This
+// file has at least one this before a super call (in ES5) and cannot be
+// automatically upgraded to ES6 as a result. Please fix this if you have a
+// chance. Note: This can sometimes be caused by not calling the super
+// constructor at all. You can run the conversion tool yourself to see what it
+// does on this file: blaze run //javascript/refactoring/es6_classes:convert.
+
 goog.provide('goog.storage.mechanism.IEUserData');
 
 goog.require('goog.asserts');
diff --git a/closure/goog/testing/fs/entry.js b/closure/goog/testing/fs/entry.js
index 080eaa07c6..7bebd0ea98 100644
--- a/closure/goog/testing/fs/entry.js
+++ b/closure/goog/testing/fs/entry.js
@@ -19,6 +19,15 @@
  */
 
 goog.setTestOnly('goog.testing.fs.DirectoryEntry');
+
+// TODO(b/130421259): We're trying to migrate all ES5 subclasses of Closure
+// Library to ES6. In ES6 this cannot be referenced before super is called. This
+// file has at least one this before a super call (in ES5) and cannot be
+// automatically upgraded to ES6 as a result. Please fix this if you have a
+// chance. Note: This can sometimes be caused by not calling the super
+// constructor at all. You can run the conversion tool yourself to see what it
+// does on this file: blaze run //javascript/refactoring/es6_classes:convert.
+
 goog.provide('goog.testing.fs.DirectoryEntry');
 goog.provide('goog.testing.fs.Entry');
 goog.provide('goog.testing.fs.FileEntry');
diff --git a/closure/goog/testing/net/xhriopool.js b/closure/goog/testing/net/xhriopool.js
index b9ed7fe260..767996a92b 100644
--- a/closure/goog/testing/net/xhriopool.js
+++ b/closure/goog/testing/net/xhriopool.js
@@ -18,6 +18,15 @@
  */
 
 goog.setTestOnly('goog.testing.net.XhrIoPool');
+
+// TODO(b/130421259): We're trying to migrate all ES5 subclasses of Closure
+// Library to ES6. In ES6 this cannot be referenced before super is called. This
+// file has at least one this before a super call (in ES5) and cannot be
+// automatically upgraded to ES6 as a result. Please fix this if you have a
+// chance. Note: This can sometimes be caused by not calling the super
+// constructor at all. You can run the conversion tool yourself to see what it
+// does on this file: blaze run //javascript/refactoring/es6_classes:convert.
+
 goog.provide('goog.testing.net.XhrIoPool');
 
 goog.require('goog.net.XhrIoPool');
diff --git a/closure/goog/ui/sliderbase_test.js b/closure/goog/ui/sliderbase_test.js
index cb9fafe1f0..a1ea19315b 100644
--- a/closure/goog/ui/sliderbase_test.js
+++ b/closure/goog/ui/sliderbase_test.js
@@ -12,6 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+
+// TODO(b/130421259): We're trying to migrate all ES5 subclasses of Closure
+// Library to ES6. In ES6 this cannot be referenced before super is called. This
+// file has at least one this before a super call (in ES5) and cannot be
+// automatically upgraded to ES6 as a result. Please fix this if you have a
+// chance. Note: This can sometimes be caused by not calling the super
+// constructor at all. You can run the conversion tool yourself to see what it
+// does on this file: blaze run //javascript/refactoring/es6_classes:convert.
+
 goog.provide('goog.ui.SliderBaseTest');
 goog.setTestOnly('goog.ui.SliderBaseTest');