Merge "Fix security vulnerability: Effect command might allow negative indexes" into klp-dev am: 501aee7a54 am: dd269152c4 am: 756f8dcdc1 am: 8b850ec8d5 am: b926fff90e am: ea841facc8 am: e6dfef5e91 am: 6f853ae378 am: 04fec8bc04 am: a2b8d9c79b am: d2185caaf7 am: 1fa7caa69b
am: bca948ed84

Change-Id: I82d899cf619f10d8d3e099e9e47eb786058ed64a