am 6a962312: am 0ddb8aab: Modify variables used in vCard code.

Merge commit '6a962312358451fbb3c77ff7f6048388178f5677'

* commit '6a962312358451fbb3c77ff7f6048388178f5677':
  Modify variables used in vCard code.