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

Change-Id: Iaa6ea4a6a97f6bb208dce73a98d6c016cb9b6d7a