Merge "Add on-property-set listener to VNS" into nyc-car-dev