Merge "Updating NotificationIncidentTest."