Merge "Fix security vulnerability: Effect command might allow negative indexes" into klp-dev
am: 501aee7a54

Change-Id: I7386c90f91d41d2b6df3efc28cfa6e4b4f79608a