Merge "Add backup_id column to raw_contacts, and hash_id column to data"