Merge "Update tests for VehicleZoneUtil" into nyc-car-dev