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

* commit '6504d74b8f7b98f7c2d5fb550042c644510d5f34':
  [maguro] Fix STK issues