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

* commit '0ed8331d3ee603e89fed2f3064cb3e5f3f9bcbf0':
  Import translations. DO NOT MERGE