am 497fcd9f: am 7b95f245: am 44c11d01: Merge "Stk: Icon related changes" into mnc-dr-dev

* commit '497fcd9fe7dde6d30e4778a2b33b32ef511d88c0':
  Stk: Icon related changes