Merge branch 'main' into avm99963-monorail

Merged commit cd4b3b336f1f14afa02990fdc2eec5d9467a827e

GitOrigin-RevId: e67bbf185d5538e1472bb42e0abb2a141f88bac1
diff --git a/sitewide/custom_404.py b/sitewide/custom_404.py
index 397bd1d..557d1ff 100644
--- a/sitewide/custom_404.py
+++ b/sitewide/custom_404.py
@@ -15,8 +15,9 @@
 from __future__ import division
 from __future__ import absolute_import
 
-import httplib
+from six.moves import http_client
 from framework import exceptions
+from framework import flaskservlet
 from framework import servlet
 
 
@@ -37,5 +38,8 @@
     if not mr.project_name:
       raise exceptions.InputException('No project specified')
     return {
-      'http_response_code': httplib.NOT_FOUND,
-      }
+        'http_response_code': http_client.NOT_FOUND,
+    }
+
+  # def Get404Page(self, **kwargs):
+  #   return self.handler(**kwargs)