am bd7ff05e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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