Merge "Fix security vulnerability: Effect command might allow negative...

Merge "Fix security vulnerability: Effect command might allow negative indexes" into klp-dev am: 501aee7a am: dd269152 am: 756f8dcd am: 8b850ec8 am: b926fff9 am: ea841fac am: e6dfef5e am: 6f853ae3 am: 04fec8bc am: a2b8d9c7 am: d2185caa am: 1fa7caa6 am: bca948ed am: fb071462 am: 9943abda
am: 7e9031b2

Change-Id: I2e39bd4bb45f503f4c10f45d2dbc522ce61df735