Merge "defconfig: msm8974: Enable thermal monitor driver in the kernel"