Merge "VCard refactoring backport." into gingerbread