am 3b4e7609: (-s ours) am e071e0b3: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into ics-mr0

* commit '3b4e7609c1f09b0471e414ef516e42454c8c1255':
  Import revised translations.  DO NOT MERGE