Merge change 25208 into eclair

* changes:
  Use Account information if possible when importing some vCard file(s).