am bdd7f592: am e7299c80: (-s ours) am 31186d05: Merge "Import revised translations. DO NOT MERGE" into ics-mr1

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