Merge "Revert "Add default route constants to RouteInfo."" into jb-mr2-dev