Merge "dumpstate:thermal: refactor dump_thermal.sh" into udc-d1-dev