diff --git a/analytics/CMakeLists.txt b/analytics/CMakeLists.txt
index 84166eb772..01bf4a4a3d 100644
--- a/analytics/CMakeLists.txt
+++ b/analytics/CMakeLists.txt
@@ -95,6 +95,12 @@ add_library(firebase_analytics STATIC
 
 set_property(TARGET firebase_analytics PROPERTY FOLDER "Firebase Cpp")
 
+if(ANDROID)
+  target_link_options(firebase_analytics
+      PRIVATE
+          "-Wl,-z,max-page-size=16384")
+endif()
+
 # Set up the dependency on Firebase App.
 target_link_libraries(firebase_analytics
     PUBLIC firebase_app)
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 4aefc3a36c..f0713e0a8b 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -362,6 +362,12 @@ else()
   target_compile_options(firebase_app PRIVATE -fno-exceptions)
 endif()
 
+if(ANDROID)
+  target_link_options(firebase_app
+      PRIVATE
+          "-Wl,-z,max-page-size=16384")
+endif()
+
 target_include_directories(firebase_app
   PUBLIC
     ${CMAKE_CURRENT_LIST_DIR}/src/include
diff --git a/app_check/CMakeLists.txt b/app_check/CMakeLists.txt
index 78c1a30912..c47b2c16ee 100644
--- a/app_check/CMakeLists.txt
+++ b/app_check/CMakeLists.txt
@@ -141,6 +141,12 @@ add_library(firebase_app_check STATIC
 
 set_property(TARGET firebase_app_check PROPERTY FOLDER "Firebase Cpp")
 
+if(ANDROID)
+  target_link_options(firebase_app_check
+      PRIVATE
+          "-Wl,-z,max-page-size=16384")
+endif()
+
 # Set up the dependency on Firebase App.
 target_link_libraries(firebase_app_check
   PUBLIC
diff --git a/auth/CMakeLists.txt b/auth/CMakeLists.txt
index 7749c68bc4..f402c76701 100644
--- a/auth/CMakeLists.txt
+++ b/auth/CMakeLists.txt
@@ -160,6 +160,12 @@ add_library(firebase_auth STATIC
 
 set_property(TARGET firebase_auth PROPERTY FOLDER "Firebase Cpp")
 
+if(ANDROID)
+  target_link_options(firebase_auth
+      PRIVATE
+          "-Wl,-z,max-page-size=16384")
+endif()
+
 # Set up the dependency on Firebase App.
 target_link_libraries(firebase_auth
   PUBLIC
diff --git a/database/CMakeLists.txt b/database/CMakeLists.txt
index 8c3550d342..ce573ba39a 100644
--- a/database/CMakeLists.txt
+++ b/database/CMakeLists.txt
@@ -195,6 +195,12 @@ add_library(firebase_database STATIC
 
 set_property(TARGET firebase_database PROPERTY FOLDER "Firebase Cpp")
 
+if(ANDROID)
+  target_link_options(firebase_database
+      PRIVATE
+          "-Wl,-z,max-page-size=16384")
+endif()
+
 # Set up the dependency on Firebase App.
 target_link_libraries(firebase_database
   PUBLIC
diff --git a/dynamic_links/CMakeLists.txt b/dynamic_links/CMakeLists.txt
index 01283f3f38..cb645addf3 100644
--- a/dynamic_links/CMakeLists.txt
+++ b/dynamic_links/CMakeLists.txt
@@ -49,6 +49,12 @@ add_library(firebase_dynamic_links STATIC
 
 set_property(TARGET firebase_dynamic_links PROPERTY FOLDER "Firebase Cpp")
 
+if(ANDROID)
+  target_link_options(firebase_dynamic_links
+      PRIVATE
+          "-Wl,-z,max-page-size=16384")
+endif()
+
 # Set up the dependency on Firebase App.
 target_link_libraries(firebase_dynamic_links
     PUBLIC firebase_app)
diff --git a/firestore/CMakeLists.txt b/firestore/CMakeLists.txt
index ae22ddd8ea..ec1e359344 100644
--- a/firestore/CMakeLists.txt
+++ b/firestore/CMakeLists.txt
@@ -307,6 +307,12 @@ add_library(firebase_firestore STATIC
 
 set_property(TARGET firebase_firestore PROPERTY FOLDER "Firebase Cpp")
 
+if(ANDROID)
+  target_link_options(firebase_firestore
+      PRIVATE
+          "-Wl,-z,max-page-size=16384")
+endif()
+
 # Set up the dependency on Firebase App.
 target_link_libraries(firebase_firestore
   PUBLIC
diff --git a/functions/CMakeLists.txt b/functions/CMakeLists.txt
index f2ee0dc314..009ce902ba 100644
--- a/functions/CMakeLists.txt
+++ b/functions/CMakeLists.txt
@@ -61,6 +61,12 @@ add_library(firebase_functions STATIC
 
 set_property(TARGET firebase_functions PROPERTY FOLDER "Firebase Cpp")
 
+if(ANDROID)
+  target_link_options(firebase_functions
+      PRIVATE
+          "-Wl,-z,max-page-size=16384")
+endif()
+
 # Set up the dependency on Firebase App.
 target_link_libraries(firebase_functions
   PUBLIC
diff --git a/gma/CMakeLists.txt b/gma/CMakeLists.txt
index 2b0b225740..401b6c9436 100644
--- a/gma/CMakeLists.txt
+++ b/gma/CMakeLists.txt
@@ -101,6 +101,12 @@ add_library(firebase_gma STATIC
 
 set_property(TARGET firebase_gma PROPERTY FOLDER "Firebase Cpp")
 
+if(ANDROID)
+  target_link_options(firebase_gma
+      PRIVATE
+          "-Wl,-z,max-page-size=16384")
+endif()
+
 # Set up the dependency on Firebase App.
 target_link_libraries(firebase_gma
     PUBLIC firebase_app)
diff --git a/installations/CMakeLists.txt b/installations/CMakeLists.txt
index cda7cca437..98e88b7f90 100644
--- a/installations/CMakeLists.txt
+++ b/installations/CMakeLists.txt
@@ -47,6 +47,12 @@ add_library(firebase_installations STATIC
 
 set_property(TARGET firebase_installations PROPERTY FOLDER "Firebase Cpp")
 
+if(ANDROID)
+  target_link_options(firebase_installations
+      PRIVATE
+          "-Wl,-z,max-page-size=16384")
+endif()
+
 # Set up the dependency on Firebase App.
 target_link_libraries(firebase_installations
   PUBLIC
diff --git a/messaging/CMakeLists.txt b/messaging/CMakeLists.txt
index 74bbf4da36..8636d12285 100644
--- a/messaging/CMakeLists.txt
+++ b/messaging/CMakeLists.txt
@@ -70,6 +70,12 @@ add_library(firebase_messaging STATIC
 
 set_property(TARGET firebase_messaging PROPERTY FOLDER "Firebase Cpp")
 
+if(ANDROID)
+  target_link_options(firebase_messaging
+      PRIVATE
+          "-Wl,-z,max-page-size=16384")
+endif()
+
 # Set up the dependency on Firebase App.
 target_link_libraries(firebase_messaging
   PUBLIC
diff --git a/remote_config/CMakeLists.txt b/remote_config/CMakeLists.txt
index 196db8f53b..95216bd5cd 100644
--- a/remote_config/CMakeLists.txt
+++ b/remote_config/CMakeLists.txt
@@ -120,6 +120,12 @@ add_library(firebase_remote_config STATIC
 
 set_property(TARGET firebase_remote_config PROPERTY FOLDER "Firebase Cpp")
 
+if(ANDROID)
+  target_link_options(firebase_remote_config
+      PRIVATE
+          "-Wl,-z,max-page-size=16384")
+endif()
+
 # Set up the dependency on Firebase App.
 target_link_libraries(firebase_remote_config
   PUBLIC
diff --git a/scripts/gha/print_matrix_configuration.py b/scripts/gha/print_matrix_configuration.py
index ad88486501..48363431b7 100644
--- a/scripts/gha/print_matrix_configuration.py
+++ b/scripts/gha/print_matrix_configuration.py
@@ -178,15 +178,16 @@
       {"type": "ftl", "device": "model=SH-01L,version=28"},  # AQUOS sense2 SH-01L
   ],
   "android_latest": [
-      {"type": "ftl", "device": "model=oriole,version=33"},  # Pixel 6
-      {"type": "ftl", "device": "model=panther,version=33"},  # Pixel 7
-      {"type": "ftl", "device": "model=lynx,version=33"},  # Pixel 7a
-      {"type": "ftl", "device": "model=cheetah,version=33"},  # Pixel 7 Pro
-      {"type": "ftl", "device": "model=felix,version=33"},  # Pixel Fold
-      {"type": "ftl", "device": "model=tangorpro,version=33"},  # Pixel Tablet
-      {"type": "ftl", "device": "model=gts8uwifi,version=33"},  # Galaxy Tab S8 Ultra
-      {"type": "ftl", "device": "model=b0q,version=33"},  # Galaxy S22 Ultra
-      {"type": "ftl", "device": "model=b4q,version=33"},  # Galaxy Z Flip4
+      {"type": "ftl", "device": "model=shiba_beta,version=35"},  # Pixel 8 (to test 16kb page size)
+#      {"type": "ftl", "device": "model=oriole,version=33"},  # Pixel 6
+#      {"type": "ftl", "device": "model=panther,version=33"},  # Pixel 7
+#      {"type": "ftl", "device": "model=lynx,version=33"},  # Pixel 7a
+#      {"type": "ftl", "device": "model=cheetah,version=33"},  # Pixel 7 Pro
+#      {"type": "ftl", "device": "model=felix,version=33"},  # Pixel Fold
+#      {"type": "ftl", "device": "model=tangorpro,version=33"},  # Pixel Tablet
+#      {"type": "ftl", "device": "model=gts8uwifi,version=33"},  # Galaxy Tab S8 Ultra
+#      {"type": "ftl", "device": "model=b0q,version=33"},  # Galaxy S22 Ultra
+#      {"type": "ftl", "device": "model=b4q,version=33"},  # Galaxy Z Flip4
   ],
   "emulator_ftl_target": [
       {"type": "ftl", "device": "model=Pixel2,version=28"},
diff --git a/storage/CMakeLists.txt b/storage/CMakeLists.txt
index e2fd88e72f..b190da5af7 100644
--- a/storage/CMakeLists.txt
+++ b/storage/CMakeLists.txt
@@ -88,6 +88,12 @@ add_library(firebase_storage STATIC
 
 set_property(TARGET firebase_storage PROPERTY FOLDER "Firebase Cpp")
 
+if(ANDROID)
+  target_link_options(firebase_storage
+      PRIVATE
+          "-Wl,-z,max-page-size=16384")
+endif()
+
 # Set up the dependency on Firebase App.
 target_link_libraries(firebase_storage
   PUBLIC
diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
index 56c07e25bc..132a2b580b 100644
--- a/testing/CMakeLists.txt
+++ b/testing/CMakeLists.txt
@@ -144,6 +144,12 @@ add_library(firebase_testing STATIC
     ${util_SRCS}
 )
 
+if(ANDROID)
+  target_link_options(firebase_testing
+      PRIVATE
+          "-Wl,-z,max-page-size=16384")
+endif()
+
 target_include_directories(firebase_testing
     PUBLIC
         ${FLATBUFFERS_SOURCE_DIR}/include