am e6b93f95: (-s ours) am 0dc42a5d: (-s ours) am 349763d0: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jolly-elf

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