am 72a31ab9: Merge "[maguro] Fix STK issues" into ics-mr1

* commit '72a31ab98f8687aa48fce028d54e79929780a302':
  [maguro] Fix STK issues