am 20478247: am c8a82edf: am a4c73066: am ef084229: Merge "Use reentrant lock for main dictionaries."

* commit '2047824739b12a6f3d5fd8a2fe49f5a689207153':