Merge branch 'main' into avm99963-monorail

Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266

GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/framework/csp_report.py b/framework/csp_report.py
index 4b6f29e..08c061d 100644
--- a/framework/csp_report.py
+++ b/framework/csp_report.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.
 
 """Servlet for Content Security Policy violation reporting.
 See http://www.html5rocks.com/en/tutorials/security/content-security-policy/
@@ -18,3 +17,4 @@
 def postCsp():
   """CSPReportPage serves CSP violation reports."""
   logging.error('CSP Violation: %s' % flask.request.get_data(as_text=True))
+  return ''