Merge "msm: camera: Add some minor code fixes." into msm-3.4