Merge "msm: 8960: Make connector resistance value consistent" into msm-3.4