Snap for 4722539 from f6877997980a1a594d495457cee2dac91f6a5534 to pi-release

Change-Id: I203762d3e5a94182e9252c990c80d9a8b4ad0855
diff --git a/boot_control.cpp b/boot_control.cpp
index 947e0d5..e8a6421 100644
--- a/boot_control.cpp
+++ b/boot_control.cpp
@@ -562,7 +562,10 @@
 	for (map_iter = ptn_map.begin(); map_iter != ptn_map.end(); map_iter++){
 		if (map_iter->second.size() < 1)
 			continue;
-		boot_ctl_set_active_slot_for_partitions(map_iter->second, slot);
+		if (boot_ctl_set_active_slot_for_partitions(map_iter->second, slot)) {
+			ALOGE("%s: Failed to set active slot for partitions ", __func__);;
+			goto error;
+		}
 	}
 	if (is_ufs) {
 		if (!strncmp(slot_suffix_arr[slot], AB_SLOT_A_SUFFIX,