Merge "Fix incidentd stack use-after-return" into rvc-dev am: 0c4353a5 am: 0595081d am: 5db0fc10 am: fa46c8fd Change-Id: Ib311377d62815bd51eade0e714ef73bd0abbd841