am 507ba65c: am 1eaddbdc: am 20478247: am c8a82edf: am a4c73066: am ef084229: Merge "Use reentrant lock for main dictionaries."
* commit '507ba65cace7f8517cb73fdf658a64c2f49ca65b':main
commit
69cb521319
* commit '507ba65cace7f8517cb73fdf658a64c2f49ca65b':main