am 971d090a: (-s ours) am eb0fff7a: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '971d090a374f5192eed256eda47d174fd8ab9c30':
  Import translations. DO NOT MERGE