diff --git a/cmake/build_shared.cmake b/cmake/build_shared.cmake
index 040179fd..52c83b11 100644
--- a/cmake/build_shared.cmake
+++ b/cmake/build_shared.cmake
@@ -108,6 +108,7 @@ function(build_firebase_shared LIBRARY_NAME ARTIFACT_NAME OUTPUT_NAME)
         "-static-libstdc++"
         # Set the max page size to 16KB, needed by Android 15
         "-Wl,-z,max-page-size=16384"
+        "-Wl,-z,common-page-size=16384"
     )
     add_custom_command(TARGET ${shared_target} POST_BUILD
       COMMAND "${ANDROID_TOOLCHAIN_PREFIX}strip" -g -S -d --strip-debug --verbose
diff --git a/cmake/build_universal.cmake b/cmake/build_universal.cmake
index d24e0490..f161150d 100644
--- a/cmake/build_universal.cmake
+++ b/cmake/build_universal.cmake
@@ -88,6 +88,7 @@ function(build_uni TARGET_LINK_LIB_NAMES PROJECT_LIST_HEADER_VARIABLE)
         "-static-libstdc++"
         # Set the max page size to 16KB, needed by Android 15
         "-Wl,-z,max-page-size=16384"
+        "-Wl,-z,common-page-size=16384"
     )
     add_custom_command(TARGET firebase_app_uni POST_BUILD
       COMMAND "${ANDROID_TOOLCHAIN_PREFIX}strip" -g -S -d --strip-debug --verbose
diff --git a/docs/readme.md b/docs/readme.md
index 59996d39..323b7b7e 100644
--- a/docs/readme.md
+++ b/docs/readme.md
@@ -71,6 +71,11 @@ Support
 
 Release Notes
 -------------
+### Upcoming
+-   Changes
+    - General (Android): Fix a crash with 16 KB page sizes.
+      ([#1259](https://github.com/firebase/firebase-unity-sdk/issues/1259)).
+
 ### 12.9.0
 -   Changes
     - General: Update to EDM4U version 1.2.186.