Merge "msm: camera: Fix CCI issues" into dev/msm-4.9-camx