Merge changes Ib0fa499e,I5f602d59 into main

* changes:
  Allow areaId JSON fields to inherit from property fields.
  Allow setting supported values for reference VHAL.