Merge "make some HVAC properties zoned am: f1ccec1 am: 78415c2" into nyc-mr1-dev-plus-aosp
am: 35f56b3

* commit '35f56b32ac2825fdbde3218e7d53187cb91d48db':

Change-Id: I57f1cf40dde0788223c7e13fee8e646a7d6c3819