Merge "Rename VEHICLE_AREA_TYPE_NONE --> VEHICLE_AREA_TYPE_GLOBAL" into pi-dev