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