Merge "Add and update VHAL Properties and permissions"