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

Change-Id: I0988552fac063db58be52c510174c5e5256c6a0d