Merge "Update cleanupAppliedPayload comment." am: 14c78c2a55

Change-Id: I283fec0c9058d279b47f1c664005546eb8550ede