am fdf7d8e4: Merge "Fixing a Monkey crash in Stk."

* commit 'fdf7d8e43952c5cbf09c6e22fb5fbfaaea626f93':
  Fixing a Monkey crash in Stk.