Merge "NPE in Stk app." am: b9ae9b4240
am: 9287dcf912

Change-Id: Ie0dc242c4d969605c958082de8fe04632d99d520