Merge commit 'd0ad67ad84e254cdf34963ad4152ca7158df5eab' into gingerbread-plus-aosp * commit 'd0ad67ad84e254cdf34963ad4152ca7158df5eab': Fix the test breakage in vCard tests.
Merge commit 'd0ad67ad84e254cdf34963ad4152ca7158df5eab' into gingerbread-plus-aosp * commit 'd0ad67ad84e254cdf34963ad4152ca7158df5eab': Fix the test breakage in vCard tests.