Merge "vehicle: Fix compiler warnings"