Fresh thermal confs

Change-Id: I13bebd5ac49a3c1b66ce0d11ce10b87c08af4134