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

Change-Id: Iee06ccd1610558dac9254e9d2bc83aee9f450dc9