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

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