Merge "incident_helper: Fix incorrect deletion" into rvc-dev am: 887d51d2e3

Change-Id: Icc8a19530debc2b39165d6882aa07cbd4b65df5c