Merge "Minor cleanup for ContactsProvider2"