Merge "Revert "Revert "Unhide RouteInfo#getType and related fields"""