Merge "Adding a custom property to the default VHAL impl" into oc-dev