am 613b168d: am d2380b8e: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev

* commit '613b168df1eb569db9ed9d1345847fea1674b9b0':
  Import translations. DO NOT MERGE