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

* commit '42958b19a7e96fdafaf7aa8e112ae51e78b83ef9':
  Import translations. DO NOT MERGE