Snap for 7262953 from 28d49bc3153891ac0a3f10e5496376063f7eec76 to rvc-d2-release

Change-Id: If031afacf41c3d9198ae2d514998b77fd1c7f40c
diff --git a/cleanup_previous_update_action.cc b/cleanup_previous_update_action.cc
index 88dbc57..9f84c3b 100644
--- a/cleanup_previous_update_action.cc
+++ b/cleanup_previous_update_action.cc
@@ -153,6 +153,7 @@
   if (!kIsRecovery &&
       !boot_control_->IsSlotMarkedSuccessful(boot_control_->GetCurrentSlot())) {
     ScheduleWaitMarkBootSuccessful();
+    return;
   }
 
   if (metadata_device_ == nullptr) {