am 1eaddbdc: am 20478247: am c8a82edf: am a4c73066: am ef084229: Merge "Use reentrant lock for main dictionaries."
* commit '1eaddbdc2bc983f8d0bf77d2322a6d2e665b1745':main
commit
507ba65cac
* commit '1eaddbdc2bc983f8d0bf77d2322a6d2e665b1745':main