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

* commit '4ca5fbaa91dc002647b2fd5f63b8a162cefc3553':
  Import translations. DO NOT MERGE