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

* commit 'c8a82edf179a9fb5af324548f06f18fc7958c3cd':
  Use reentrant lock for main dictionaries.