Merge "Fix thermalserviced_tmpfs compat recording mistake." into oc-mr1-dev