Revert "Rearrange HVAC properties"

This reverts commit 6e104ad157362984d15a58525c8f0f1aaaad3319.

Change-Id: I7beb1142c0cc57f90a27652324689e0722252202
5 files changed