Merge commit 'b1f5a54a2abd95d03dc96f5f691495d2d7dfadc7' into gingerbread-plus-aosp * commit 'b1f5a54a2abd95d03dc96f5f691495d2d7dfadc7': VCard refactoring backport.
Merge commit 'b1f5a54a2abd95d03dc96f5f691495d2d7dfadc7' into gingerbread-plus-aosp * commit 'b1f5a54a2abd95d03dc96f5f691495d2d7dfadc7': VCard refactoring backport.