am 0e45086d: am 5660b484: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '0e45086dffacca8b3ae8c09ee2e940ff7d09b25a':
  Import translations. DO NOT MERGE