Merge "UpdateEngine: fix cleanupAppliedPayload impl" am: 54aba47b29

Change-Id: I9ff3ddc4dbf17d8d6401fc7c14ee8b16d7aafb2b