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

* commit '497a40e0b274ecdbc7dd8e771ded57be9f0b6727':
  Import translations. DO NOT MERGE