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

* commit 'f43dc6a2aa85fa5a4f383b944a9e0c86804458da':
  Import translations. DO NOT MERGE