Includes consistent formatting of Spring-patched files. Closes gh-28699 (cherry picked from commit 7a60e2024b)
7a60e2024b