am 3a3a84e4: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev

* commit '3a3a84e4d6e507102ab52df9562191bbb98f4a88':
  Import translations. DO NOT MERGE