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

* commit '3f4d63e50b7a0a6a062f70042ee30ce73f1f06c6':
  Import translations. DO NOT MERGE