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

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