am 825b7012: am f6d4b290: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '825b70129ac3a26e6912fa6c2553a4a7913557ec':
  Import translations. DO NOT MERGE