Merge branch 'main' into avm99963-monorail

Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266

GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/features/savedqueries.py b/features/savedqueries.py
index fb99fcf..427faa3 100644
--- a/features/savedqueries.py
+++ b/features/savedqueries.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.
 
 """Page for showing a user's saved queries and subscription options."""
 from __future__ import print_function
@@ -15,7 +14,6 @@
 
 from features import savedqueries_helpers
 from framework import framework_helpers
-from framework import flaskservlet
 from framework import permissions
 from framework import servlet
 from framework import urls
@@ -76,8 +74,8 @@
         mr, '/u/%s%s' % (mr.viewed_username, urls.SAVED_QUERIES),
         include_project=False, saved=1, ts=int(time.time()))
 
-  # def GetSavedQueriesPage(self, **kwargs):
-  #   return self.handler(**kwargs)
+  def GetSavedQueriesPage(self, **kwargs):
+    return self.handler(**kwargs)
 
-  # def PostSavedQueriesPage(self, **kwargs):
-  #   return self.handler(**kwargs)
+  def PostSavedQueriesPage(self, **kwargs):
+    return self.handler(**kwargs)