Merge "thermal: msm8974: Fix calibration less temperature readings" into msm-3.4