Merge "Add PrintServiceRecommendationService to the default distro" into nyc-dev