Merge 87a766b74e5c96858d4a1bd7dc8abfe249e5e551 on remote branch

Change-Id: Ic0b97be0de4d8291740c21f18e0d33c771410e86
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) {