Clean up local variable usage - Heat

Change-Id: Ia912a8d3ea764dc713e8fdc380175ab98f887a60
Merge "Clean up local variable usage - Heat"