am 5a734bd7: Merge "Support legacy routes added by apps via ensureRouteToHost()." into lmp-preview-dev am: ef1df196e5

Original change: undetermined

Change-Id: I169c6efbda0a689004524066a0d6e2ab03887678