am ca9140bd: (-s ours) am e3748309: am 28989acb: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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