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

Change-Id: I18631af24edc7d2c2b6cc36254c2d082ccc8f193