Merge "Expose internal representation of transport types."