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

Change-Id: I73d2adb8bf880b4ddcf6ce58dae6fadd4a83a9bb