am 38987073: Merge "Import translations. DO NOT MERGE" into jb-dev

* commit '38987073c1b1a993a727210f981601217d30b899':
  Import translations. DO NOT MERGE