am b62b41d3: (-s ours) am 02d29ff5: am a1b3b99c: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev

* commit 'b62b41d3bad26820aebaca1e1c233f0f367386da':
  Import translations. DO NOT MERGE