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

Change-Id: Id093997f3ff58f89ec5aced7006d34201ae52ecd