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

* commit '9d4c0d42a3a7c509432edc9e90c2462f5f40d831':
  Import translations. DO NOT MERGE