am f54dbc8e: (-s ours) Merge changes Ie26719cb,I6d1b943b into ics-mr1

* commit 'f54dbc8e773642f924b9390d89df8779577e2493':
  Import revised translations.  DO NOT MERGE
  Restore deleted string still referenced from layout.