Merge "msm: camera: Reduce CDM reset timeout to 300msec" into dev/msm-4.9-camx