Merge \\"Handling of Fuji Xerox in RecommendationService.\\" into nyc-dev am: 5398f2731b
am: 0273d5d4ed

Change-Id: Ib0ea427162ea3003fc1038a308826c2fd26f9774