diff --git a/platform/msm_shared/rpmb/rpmb_emmc.c b/platform/msm_shared/rpmb/rpmb_emmc.c
index 7250505..dbf7664 100644
--- a/platform/msm_shared/rpmb/rpmb_emmc.c
+++ b/platform/msm_shared/rpmb/rpmb_emmc.c
@@ -150,7 +150,7 @@
 
 int rpmb_read_emmc(struct mmc_device *dev, uint32_t *req_buf, uint32_t blk_cnt, uint32_t *resp_buf, uint32_t *resp_len)
 {
-	struct mmc_command cmd[3] = {{0}, {0}, {0}};
+	struct mmc_command cmd[3] = {{0},{0},{0}};
 	int ret = 0;
 	struct rpmb_frame *result = (struct rpmb_frame *)resp_buf;
 
diff --git a/project/msm8953.mk b/project/msm8953.mk
index 9787a5a..9582017 100644
--- a/project/msm8953.mk
+++ b/project/msm8953.mk
@@ -102,8 +102,10 @@
 #Enable the external reboot functions
 ENABLE_REBOOT_MODULE := 1
 
+ifeq ($(VERIFIED_BOOT),1)
 #Enable MDTP feature
 ENABLE_MDTP_SUPPORT := 1
+endif
 
 ifeq ($(ENABLE_MDTP_SUPPORT),1)
 DEFINES += MDTP_SUPPORT=1
diff --git a/project/msm8996.mk b/project/msm8996.mk
index 5978add..50ec0b7 100644
--- a/project/msm8996.mk
+++ b/project/msm8996.mk
@@ -92,7 +92,9 @@
 DEFINES += ENABLE_PARTIAL_GOODS_SUPPORT=1
 endif
 
+ifeq ($(VERIFIED_BOOT),1)
 ENABLE_MDTP_SUPPORT := 1
+endif
 
 ifeq ($(ENABLE_MDTP_SUPPORT),1)
 DEFINES += MDTP_SUPPORT=1