Upgrade to new Android Studio - changes to provider.