Merge change 25206 into eclair

* changes:
  Make vCard importer code use Account information if possible.