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

Change-Id: I4786037f49f5da37a1a363f7cb01c9c086776624