Merge "Adding a custom property to the default VHAL impl" into oc-dev
am: 69c42429d1

Change-Id: I56225b64b36d709e74e952ef9c918f475e15ee1a