Merge "Expose PortLocationType in car-lib" into pi-dev