Merge change 22399 into eclair

* changes:
  Refactor VCard handling code, phase 2, 3, 4, 5