Merge "Fix a race conditon in `incident`." into rvc-dev am: 7b35bb384e am: 4c13902195 am: de4d0acfcf

Change-Id: I55daf16b810760dafa7264b6b46b017fda23c735