Merge "RouteInfo changes." into jb-mr2-dev