Merge change Ibeb22f37 into eclair

* changes:
  Call the proper variant of markAsContacted.