Merge "Fix the test breakage in vCard tests." into gingerbread