adding heat support

Change-Id: I547722f33ec3b9d64571cac05462428defd0d3fd
Merge "adding heat support"