Merge "Fix security vulnerability: Effect command might allow negative indexes" into klp-dev am: 501aee7a54 am: dd269152c4 am: 756f8dcdc1
am: 8b850ec8d5

Change-Id: I1cf21ca7d1124a986f390b103f4c641b67e807a9