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

Change-Id: Ia36571a591829777096ad41316b7edf169ce9a6c