Merge "Support legacy routes added by apps via ensureRouteToHost()." am: 898d27e7c3

Original change: undetermined

Change-Id: I0b1040a49d28b93a9e6eedcf6106a07d21d10854