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

Change-Id: I336c76f311fc09cd81ccd22a35dada99d0b76be7