am 1922ac10: (-s ours) am d0ad67ad: Merge "Fix the test breakage in vCard tests." into gingerbread

Merge commit '1922ac108ce6fd12f640b2892aa1eb348911a94b'

* commit '1922ac108ce6fd12f640b2892aa1eb348911a94b':
  Fix the test breakage in vCard tests.