Merge change 6549

* changes:
  Add strings needed by the new contacts provider.