am 2407ed15: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '2407ed15318453e5284153477453a94f19c324f4':
  Import translations. DO NOT MERGE