Merge "API change for: Revive CONTACTS_DATABASE_CREATED, and..."