Merge "msm: camera: isp: variable should be accessed only if match is found" into camera-kernel.lnx.1.0