Merge "Fix VehicleZoneUtilTest" into nyc-car-dev