am d9925af4: Merge "Fix crash in STK." into ics-mr1

* commit 'd9925af4e9f94c27d60e290170eaaa6e196a8ed5':
  Fix crash in STK.