Merge "msm: camera: icp: Fix out of bound issue in ICP" into dev/msm-4.9-camx