Merge change 24097 into eclair

* changes:
  Fix small bugs in VCardComposer.java.