Merge "Merge "Fix out of bound error of IncidentService" into rvc-qpr-dev am: f1d26a395f am: 672dbc997c"