Merge "Fix out of bound error of IncidentService"