am cfdc0773: (-s ours) Fixing the "duplication" of contacts

Merge commit 'cfdc0773948fb9788f31495eb876fae3a069eb3a'

* commit 'cfdc0773948fb9788f31495eb876fae3a069eb3a':
  Fixing the "duplication" of contacts