Merge "msm: camera: Convert camera sensors into i2c devices" into msm-3.0