Merge "Handle all zone types properly in CarPopertyUtils." into nyc-car-dev