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

* commit '0ec825ed70dd8383b0248608aa7abe0e8ed81854':
  Import translations. DO NOT MERGE