Merge "RouteDiscoveyPreference: Update javadoc"