am 861cdc99: (-s ours) am 8446d354: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic

* commit '861cdc99b85d0304184847493ea9be56b3449ca2':
  Import translations. DO NOT MERGE