am 82b141e2: (-s ours) am c70ec659: Merge "Import translations. DO NOT MERGE" into jb-dev

* commit '82b141e26771f2f1fc16af12a9435f7a60091738':
  Import translations. DO NOT MERGE