Fix epic problem with no_route_to_host

Change-Id: I9cd9a7f314a8a5d03821fadf1ef0d3f548861c93
Merge "Fix epic problem with no_route_to_host"