Merge "Cleanup ContactsIndexerUserInstance" into tm-dev