am 347daf3a: Merge change I2a52a60a into eclair-mr2

Merge commit '347daf3a9802b2a4184ff8aa90b4af6c5de79ab7' into eclair-mr2-plus-aosp

* commit '347daf3a9802b2a4184ff8aa90b4af6c5de79ab7':
  Implement unit tests for vCard exporter, which depends on the sucess in vCard importer.