am 727ae40f: Merge "Fix locking on string init map (again)."

* commit '727ae40f07857289a7d5f1d51228962ae04edc14':
  Fix locking on string init map (again).