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

* commit '38af8108c169067479968b6f4ca7e4d8f0ac7c3b':
  Import translations. DO NOT MERGE