Merge "FPII-2680 : Fix security vulnerability: Effect command might allow negative indexes CVE-2017-0385 A-32585400" into fp/fp2_5.1_int