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

Change-Id: Idee8cd9b5f0322d2e52bc803f9bf364033fe43e1