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

Change-Id: I918b03096776bb3881b1b3521e0da9917bbb1111