Merge commit '718816821564b61301b0ea93423f7d9d47c2d555' * commit '718816821564b61301b0ea93423f7d9d47c2d555': Fix small bugs in VCardComposer.java.
Merge commit '718816821564b61301b0ea93423f7d9d47c2d555' * commit '718816821564b61301b0ea93423f7d9d47c2d555': Fix small bugs in VCardComposer.java.