Merge branch '1.5.1_google' into 1.5.2

wjc

2025-04-22 cbd0384e4e68c3d838981aba0602c6d76fdc091b

 .gitignore

@@ -52,3 +52,4 @@
.idea/workspace.xml
.idea/
*.properties
local.properties