am ba82b53d: (-s ours) am 26fe0761: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

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