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

Change-Id: Ifc25e6d878549cf372bc4b998fb55ad449f7571e