Merge "msm: camera: isp: Change local variable from uint32_t to int" into dev/msm-4.9-camx