Merge change 23344 into eclair

* changes:
  Make vCard composer handle null of Photo entry correctly.