am 0ef87868: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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