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

Change-Id: I226fa5718f3c7d976f717a67c04d9d7c5afc3032