Merge branch '1.5.2' into 1.5.1_google

wjc

2025-04-09 0b357bcd7c472c91227093239f180a28638c57a4

 .gitignore

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