Merge "Fix the ArrayIndexOutOfBound issue." into ics-mr1