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

* commit '7d6a0f9c8b9494e3b735ea98836ff3b826e11c8e':
  Import translations. DO NOT MERGE