am 8ed48222: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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