Merge "msm: camera: Add fix to avoid array index out of bound in cpp"