Merge "Update thermal related string to support non-phone device" into udc-qpr-dev