diff --git a/Android.bp b/Android.bp
index c8e2020..8b66e37 100644
--- a/Android.bp
+++ b/Android.bp
@@ -24,7 +24,7 @@
     srcs: ["src/**/*.java"],
     sdk_version: "module_current",
     min_sdk_version: "30",
-    target_sdk_version: "34", // Keep in sync with CaptivePortalLoginTests
+    target_sdk_version: "35", // Keep in sync with CaptivePortalLoginTests
     static_libs: [
         "androidx.annotation_annotation",
         "androidx.legacy_legacy-support-core-ui",
diff --git a/res/layout/activity_captive_portal_login.xml b/res/layout/activity_captive_portal_login.xml
index d61cca5..9d9ccb9 100644
--- a/res/layout/activity_captive_portal_login.xml
+++ b/res/layout/activity_captive_portal_login.xml
@@ -3,6 +3,7 @@
     android:id="@+id/container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     tools:context="com.android.captiveportallogin.CaptivePortalLoginActivity"
     tools:ignore="MergeRootFrame" >
 
diff --git a/tests/Android.bp b/tests/Android.bp
index 4dfc7dd..f8195a1 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -31,7 +31,7 @@
     platform_apis: true,
     compile_multilib: "both",
     min_sdk_version: "30",
-    target_sdk_version: "34", // Keep in sync with CaptivePortalLogin
+    target_sdk_version: "35", // Keep in sync with CaptivePortalLogin
     test_suites: [
         "general-tests",
         "mts-networking",