am 36c7d313: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '36c7d313af815c8842d7ca9002ff36bfe347716b':
  Import translations. DO NOT MERGE