Merge "@removed requestRouteToHost and {start,stop}UsingNetworkFeature"