Merge commit '258bc9cb44f637d9ea1377d81a995bec2bd10a1d' * commit '258bc9cb44f637d9ea1377d81a995bec2bd10a1d': Develop ContentResolver-based unit tests for vCard importer and fix vCard code
Merge commit '258bc9cb44f637d9ea1377d81a995bec2bd10a1d' * commit '258bc9cb44f637d9ea1377d81a995bec2bd10a1d': Develop ContentResolver-based unit tests for vCard importer and fix vCard code