am f4e80c84: Merge "Import revised translations. DO NOT MERGE" into ics-mr1

* commit 'f4e80c840944e81eae96426a995c26712f1b9780':
  Import revised translations. DO NOT MERGE