Merge "vehicle hal refactoring from hal review" into nyc-dev