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

* commit '75d66ffe82a83f90a033c3e7b1f15a67014122cd':
  Import translations. DO NOT MERGE