Merge "Reflect vCard API change"