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

Change-Id: Id9974657e3da0c5a061135e04f58595b6496360b