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

* commit '21ce854b50667bf675bc36ce0db1a3d6f0a2ab92':
  Import translations. DO NOT MERGE