am b2e90bea: (-s ours) am 15ae8e5c: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into ics-mr0

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