update heat flags and tables

Change-Id: Ib32ecfab49a6de3dabda207ba2919a0c6ff63bba
Merge "update heat flags and tables"