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

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