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