am d40b2e99: (-s ours) am 4e4d6599: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic

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