Merge "Change the code around vCard import + Service."