Merge "Allow ContactsProvider to remove dulicates" into ics-mr1