Merge "mako: termal: change thermal.conf" into jb-mr1-dev