am 22a17ce6: (-s ours) am b1f5a54a: Merge "VCard refactoring backport." into gingerbread

Merge commit '22a17ce60b5e8770ad950cc3da6d8f5a2be3b879'

* commit '22a17ce60b5e8770ad950cc3da6d8f5a2be3b879':
  VCard refactoring backport.