am 2028f8e0: am 38939259: am c3b6ee60: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '2028f8e0989c1ddcec885630c87a5f1e632a9bc4':
  Import translations. DO NOT MERGE