diff --git a/aosp_husky_pgagnostic.mk b/aosp_husky_pgagnostic.mk
index 0b10a4e..c005922 100644
--- a/aosp_husky_pgagnostic.mk
+++ b/aosp_husky_pgagnostic.mk
@@ -16,10 +16,11 @@
 $(call inherit-product, device/google/shusky/aosp_husky.mk)
 
 PRODUCT_NAME := aosp_husky_pgagnostic
-PRODUCT_MODEL := AOSP page-size agnostic Husky 64K ELF
+PRODUCT_MODEL := AOSP page-size agnostic Husky 16KB ELF
 
 PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
-PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 65536
+PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 16384
+PRODUCT_16K_DEVELOPER_OPTION := true
 
 TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
 
diff --git a/aosp_shiba_pgagnostic.mk b/aosp_shiba_pgagnostic.mk
index 9d2434c..91a9992 100644
--- a/aosp_shiba_pgagnostic.mk
+++ b/aosp_shiba_pgagnostic.mk
@@ -16,10 +16,11 @@
 $(call inherit-product, device/google/shusky/aosp_shiba.mk)
 
 PRODUCT_NAME := aosp_shiba_pgagnostic
-PRODUCT_MODEL := AOSP page-size agnostic Shiba 64K ELF
+PRODUCT_MODEL := AOSP page-size agnostic Shiba 16KB ELF
 
 PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
-PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 65536
+PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 16384
+PRODUCT_16K_DEVELOPER_OPTION := true
 
 TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4