Merge "Remove product specific strings from Contacts" into ub-contactsdialer-i-dev