am 435c0374: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev

* commit '435c03749abd6f504dd5f6dd3c5c3b4d549ff702':
  Import translations. DO NOT MERGE