Merge "[maguro] Fix STK issues" into ics-mr1