Fix security vulnerability: Effect command might allow negative indexes am: 01183402d7 am: 94e3424b74 am: 9bf3487e7a am: d4881f8406 am: f31abe2c96 am: 0905c40edc
am: 7b4d79044d

Change-Id: I03daf2b067e7e6a725e546040bc994ba792a5a5c