am d8567b66: am 47ae0b93: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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