Fix security vulnerability: Effect command might allow negative indexes am: 500a9feaf8
am: 10428159a9

Change-Id: I04d87df68ea2a6d52b4454dda8fcfa033fb96533