am f118bcc5: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

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