am d304e8bf: (-s ours) am df523ec5: Merge "Import translations. DO NOT MERGE" into jb-dev

* commit 'd304e8bfc7094763cdbbfc2d84f71e2912f7bfcf':
  Import translations. DO NOT MERGE