Merge "RouteDiscoveryPreference cleanup"