Fix security vulnerability: Effect command might allow negative indexes am: 01183402d7 am: 94e3424b74 am: 9bf3487e7a am: d4881f8406 am: f31abe2c96 am: 0905c40edc am: 7b4d79044d am: a6323b04de am: d8383694f9 am: e92a0c60d8 am: 3712921ae9 am: df9b8955cb
am: 3939df6105

Change-Id: Ie8d3167ba9e72a343ae0682682de5c22a181f2ea