Merge "Rename RouteSessionInfo and RouteSessionController"