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

Change-Id: Ie524b232ebba3ecdeeceaeddf61468ac7394e1c5