Merge "Allow recovery to read thermal info" into oc-dev