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

Change-Id: I0275c7561f4da96d0a17a663d4c2ce8942f33bbb