Merge "Resolve TODOs in Vehicle HAL interface"