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

Change-Id: I9ce75a77ed741953c3476576387eebf77e21f784