Merge change 23527 into eclair

* changes:
  Adding a convenience method to resolve contact lookup URI to a regular content URI