Merge branch 'main' into avm99963-monorail

Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266

GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/features/hotlistissuescsv.py b/features/hotlistissuescsv.py
index 2b35dad..04fdb52 100644
--- a/features/hotlistissuescsv.py
+++ b/features/hotlistissuescsv.py
@@ -1,7 +1,6 @@
-# Copyright 2016 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file or at
-# https://developers.google.com/open-source/licenses/bsd
+# Copyright 2016 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
 
 """Implemention of the hotlist issues list output as a CSV file."""
 from __future__ import print_function
@@ -61,5 +60,5 @@
     return csv_helpers.ReformatRowsForCSV(
         mr, page_data, '%d/csv' % mr.hotlist_id)
 
-  # def GetHotlistIssuesCsvPage(self, **kwargs):
-  #   return self.handler(**kwargs)
+  def GetHotlistIssuesCsvPage(self, **kwargs):
+    return self.handler(**kwargs)