Merge "Added strings for thermal shutdown warning" into oc-dev