Merge "vehicle hal update" into nyc-dev