am 23dcd393: am 3235c1e2: am aeefef59: Stk App bug fix and code refine.

* commit '23dcd39399da2b672c9bc2ac01c30caa164f0083':
  Stk App bug fix and code refine.