Merge "UpdateEngine: fix cleanupAppliedPayload impl"