Merge "Fix incidentd stack use-after-return" into rvc-dev am: 0c4353a5 am: 24134f28 am: f7d2394f Change-Id: I358cca0a08c44e3282121a6d1cc33cc7e93ebe47