diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index a36faba15be5..5c3b2cbe1407 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -368,6 +368,7 @@ CONFIG_DMADEVICES=y
 CONFIG_UIO=y
 CONFIG_VIRTIO_PCI=m
 # CONFIG_VIRTIO_PCI_LEGACY is not set
+CONFIG_VIRTIO_PMEM=m
 CONFIG_VIRTIO_INPUT=m
 CONFIG_VIRTIO_MMIO=m
 CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
@@ -395,6 +396,9 @@ CONFIG_GENERIC_PHY=y
 CONFIG_RAS=y
 CONFIG_ANDROID=y
 CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_LIBNVDIMM=y
+# CONFIG_ND_BLK is not set
+# CONFIG_BTT is not set
 CONFIG_EXT4_FS=y
 CONFIG_EXT4_FS_SECURITY=y
 CONFIG_F2FS_FS=y
diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig
index 4a42b2d3d3b1..5ce4d4eeb61b 100644
--- a/arch/x86/configs/gki_defconfig
+++ b/arch/x86/configs/gki_defconfig
@@ -320,6 +320,7 @@ CONFIG_RTC_DRV_TEST=m
 CONFIG_UIO=y
 CONFIG_VIRTIO_PCI=m
 # CONFIG_VIRTIO_PCI_LEGACY is not set
+CONFIG_VIRTIO_PMEM=m
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_INPUT=m
 CONFIG_VIRTIO_MMIO=m
@@ -332,6 +333,9 @@ CONFIG_PM_DEVFREQ=y
 CONFIG_IIO=y
 CONFIG_ANDROID=y
 CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_LIBNVDIMM=y
+# CONFIG_ND_BLK is not set
+# CONFIG_BTT is not set
 CONFIG_EXT4_FS=y
 CONFIG_EXT4_FS_SECURITY=y
 CONFIG_EXT4_ENCRYPTION=y
diff --git a/cuttlefish.fragment b/cuttlefish.fragment
index 4db9bb12cbb7..25b81c62ca91 100644
--- a/cuttlefish.fragment
+++ b/cuttlefish.fragment
@@ -15,6 +15,7 @@ CONFIG_SND_INTEL8X0=m
 CONFIG_USB_DUMMY_HCD=m
 CONFIG_RTC_DRV_TEST=m
 CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_PMEM=m
 CONFIG_VIRTIO_INPUT=m
 CONFIG_VIRTIO_MMIO=m
 CONFIG_ION=m