Merge branch '1.2.1' into 1.2.0_google

wjc

2025-05-23 971a24a9e58a21bc306897fd3ad63012a399f7db

1
2
3
4
5
6
7
8
9
10
11
12
/build 
*.idea 
/.idea/libraries 
/.idea/modules 
/.idea/compiler.xml 
/.idea/gradle.xml 
/.idea/jarRepositories.xml 
/.idea/misc.xml 
/.idea/modules.xml 
/.idea/vcs.xml 
/.idea/workspace.xml 
/release