Merge "Remove string init map." am: 7d9ddcc909
am: 1bbfb96fee

* commit '1bbfb96fee16e67eabd63dd4ccdc480b4dcd34c2':
  Remove string init map.