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

Change-Id: I7f305a4dacb8dd382a52d6b3f95b41bfbd5151a6