Merge branch 'thermal-framework' into linux-linaro-lsk