am 93b06760: (-s ours) am 84b8551a: am e4895175: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev

* commit '93b06760ccef95a6b46b0f455ed5dbb1a46a9dae':
  Import translations. DO NOT MERGE