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

Change-Id: I80fd0384acbc50370d685af4158d4feccda81994