am 9e30c0e1: Merge "Fix locking on string init map."

* commit '9e30c0e177adabaaf94a66c91130a19a7632fc7c':
  Fix locking on string init map.