am 8ddcdbd4: (-s ours) am 11665038: Merge "Import translations. DO NOT MERGE" into jb-dev

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