Merge "msm: camera: isp: Poll for CSID hardware reset status" into dev/msm-4.9-camx