Merge "NPE in Stk app."
am: b9ae9b4240

Change-Id: I0766f47a1d2b156d83accdf69a20febf74c1c855