am 542cf02d: (-s ours) am 93e416b2: (-s ours) am fb291f5a: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic

* commit '542cf02d69be16ac39c5839f81cec43cda2802d4':
  Import translations. DO NOT MERGE