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

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