Merge "Update cleanupAppliedPayload comment." into rvc-dev am: 325bbcf799 am: 53b6d512ad

Change-Id: I85a60871014e1e9023551ac3317547694a7227b0