Merge "Merge "Fix a race conditon in `incident`." into rvc-dev am: 7b35bb384e am: 2dc6307e68" into rvc-d1-dev-plus-aosp