am 8b0cdba3: (-s ours) am 7409c9d5: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '8b0cdba3d19a2cebc6809dded62f5951ecfe3a49':
  Import translations. DO NOT MERGE