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

* commit '7aa6b3f025bfab50ab510690490bd9d5a91fe8e8':
  Import revised translations.  DO NOT MERGE