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