am 02d29ff5: am a1b3b99c: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev

* commit '02d29ff5fe1fcd89baf6af96d48c56e1b880178d':
  Import translations. DO NOT MERGE