Merge "Handling of Fuji Xerox in RecommendationService." into nyc-dev