diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index cec75d966..772a7b7ae 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -10,7 +10,7 @@ android {
     namespace = "com.firebase.uidemo"
 
     defaultConfig {
-        minSdk = Config.SdkVersions.min
+        minSdk = 23
         targetSdk = Config.SdkVersions.target
 
         versionName = Config.version
diff --git a/auth/build.gradle.kts b/auth/build.gradle.kts
index 66df263a8..2005c5c25 100644
--- a/auth/build.gradle.kts
+++ b/auth/build.gradle.kts
@@ -11,8 +11,9 @@ android {
     namespace = "com.firebase.ui.auth"
 
     defaultConfig {
-        minSdk = Config.SdkVersions.min
-        targetSdk =Config.SdkVersions.target
+        // Auth requires a higher minSdk than the current Config.SdkVersions.min
+        minSdk = 23
+        targetSdk = Config.SdkVersions.target
 
         buildConfigField("String", "VERSION_NAME", "\"${Config.version}\"")
 
diff --git a/auth/src/main/java/com/firebase/ui/auth/data/model/FlowParameters.java b/auth/src/main/java/com/firebase/ui/auth/data/model/FlowParameters.java
index c6dac950a..d13187c7d 100644
--- a/auth/src/main/java/com/firebase/ui/auth/data/model/FlowParameters.java
+++ b/auth/src/main/java/com/firebase/ui/auth/data/model/FlowParameters.java
@@ -53,7 +53,6 @@ public FlowParameters createFromParcel(Parcel in) {
             String termsOfServiceUrl = in.readString();
             String privacyPolicyUrl = in.readString();
             boolean enableCredentials = in.readInt() != 0;
-            boolean enableHints = in.readInt() != 0;
             boolean enableAnonymousUpgrade = in.readInt() != 0;
             boolean alwaysShowProviderChoice = in.readInt() != 0;
             boolean lockOrientation = in.readInt() != 0;
diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt
index e4aed3d45..69be31051 100644
--- a/buildSrc/src/main/kotlin/Config.kt
+++ b/buildSrc/src/main/kotlin/Config.kt
@@ -1,5 +1,5 @@
 object Config {
-    const val version = "9.0.0"
+    const val version = "9.1.0-SNAPSHOT"
     val submodules = listOf("auth", "common", "firestore", "database", "storage")
 
     private const val kotlinVersion = "2.1.0"
@@ -7,7 +7,9 @@ object Config {
     object SdkVersions {
         const val compile = 34
         const val target = 34
-        const val min = 23
+        // Note that auth uses a different minSdk than this and
+        // should be changed in auth/build.gradle.kts
+        const val min = 21
     }
 
     object Plugins {
diff --git a/gradle.properties b/gradle.properties
index 26ae8292a..479fda855 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,7 +16,7 @@ android.nonTransitiveRClass=false
 android.defaults.buildfeatures.buildconfig=true
 
 GROUP=com.firebaseui
-VERSION_NAME=9.0.0
+VERSION_NAME=9.1.0-SNAPSHOT
 
 POM_PACKAGING=aar
 POM_DESCRIPTION=FirebaseUI for Android