Merge change 23909 into eclair

* changes:
  Add ddms support for contacts.