Merge change 21364 into eclair

* changes:
  Moving contacts-specific strings to donottranslate files.