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

Change-Id: I1e1cddf4f5a95b4ac251aae6ff5db31877517936