Merge "Add more options on RouteDiscoveryPreference"