Merge "Wrong index can disable the STK application unintentionally"
am: 778de407af

Change-Id: I65392c517e3e3deca43af8ca783f01654b8c8a5c