Merge change 27077 into eclair

* changes:
  Two changes toward vCard composer.