am 2d1654b0: am 692999a4: (-s ours) am f4e80c84: Merge "Import revised translations. DO NOT MERGE" into ics-mr1

* commit '2d1654b054eae4f08831f1c753c9ccc66a585980':
  Import revised translations. DO NOT MERGE