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

* commit '177d984ab91661953259d5329ed01ded5a497d43':
  Import translations. DO NOT MERGE