Merge "Fix security vulnerability: Effect command might allow negative indexes" into security-aosp-nyc-mr1-release