Merge "Refactor VHAL"