Merge "Support legacy routes added by apps via ensureRouteToHost()." am: 536817e165

Original change: undetermined

Change-Id: I599233af62d6f40836b77342a6c93e545d8838e3