diff --git a/platform/msm_shared/avb/VerifiedBoot.c b/platform/msm_shared/avb/VerifiedBoot.c
index 043a5ae..5816d33 100644
--- a/platform/msm_shared/avb/VerifiedBoot.c
+++ b/platform/msm_shared/avb/VerifiedBoot.c
@@ -512,7 +512,7 @@
 	Info->vb_data = (VOID *)VBData;
 
 	ImageHdrSize = get_page_size();
-	GUARD_OUT(getimage(Info, &image_buffer, &imgsize,(!Info->multi_slot_boot && Info->bootinto_recovery) ? "recovery" : "boot") );
+	GUARD_OUT(getimage(&image_buffer, &imgsize,(!Info->multi_slot_boot && Info->bootinto_recovery) ? "recovery" : "boot") );
 
 	Status = check_img_header(image_buffer, ImageHdrSize, &imgsizeActual);
 	if (Status != EFI_SUCCESS) {
diff --git a/platform/msm_shared/avb/libavb/avb_ops.c b/platform/msm_shared/avb/libavb/avb_ops.c
index ebb84c7..4c1b81c 100644
--- a/platform/msm_shared/avb/libavb/avb_ops.c
+++ b/platform/msm_shared/avb/libavb/avb_ops.c
@@ -176,12 +176,12 @@
 	}
 	*OutNumRead = 0;
 
-	if (!strncmp(Partition,"boot",strlen("boot"))) {
-		/* API returns previously loaded Boot Image buffer address and size */
-		get_boot_image_info(Buffer, OutNumRead, "boot");
+	if (!getimage(Buffer, OutNumRead, Partition)) {
+		/* API returns previously loaded Images buffer address and size */
+		dprintf(SPEW, "DEBUG: %s already loadded \n", Partition);
 		return AVB_IO_RESULT_OK;
 	}
-
+	dprintf(SPEW, "%s Loading image\n", Partition);
 	index = partition_get_index(Partition);
 	ptn = partition_get_offset(index);
 
diff --git a/platform/msm_shared/include/boot_device.h b/platform/msm_shared/include/boot_device.h
index c4305fc..4eb172c 100644
--- a/platform/msm_shared/include/boot_device.h
+++ b/platform/msm_shared/include/boot_device.h
@@ -89,9 +89,7 @@
 	IMG_MAX
 } img_type;
 
-int getimage(const bootinfo *Info, void **image_buffer, uint32_t *imgsize,
-                    char *imgname);
-
+int getimage(void **image_buffer, uint32_t *imgsize, const char *imgname);
 void platform_read_boot_config();
 uint32_t platform_get_boot_dev();
 uint32_t platform_boot_dev_isemmc();