Revert^2 "Create thermal apex"

33251ba579b7deb1321dcc0a60ee2d11741af013

Change-Id: If3dd5bd1d8d35fc398a51e531fd9bf43ab91fb39
8 files changed