Fix security vulnerability: Effect command might allow negative indexes am: 01183402d7
am: 94e3424b74

Change-Id: Id0353ac5716377b45e3a967110d43d9baf744be8