Merge changes I40bfa0f8,I9fe6a999

* changes:
  Restore deleted string still referenced from AndroidManifest.
  Import revised translations.