Merge commit 'e7a5141c0db324ab17b0b5f316463cc8a6a3c36a' * commit 'e7a5141c0db324ab17b0b5f316463cc8a6a3c36a': Move some useful logic to VCardTestsBase.java
Merge commit 'e7a5141c0db324ab17b0b5f316463cc8a6a3c36a' * commit 'e7a5141c0db324ab17b0b5f316463cc8a6a3c36a': Move some useful logic to VCardTestsBase.java