Merge "Fix a race conditon in `incident`." am: 4cfcf0031f

Change-Id: I97a0d626b29baee683265d430dbf87a269580db3