Merge "Fix crash in STK." into ics-mr1