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

Change-Id: I4d450a9a37d7a4055111604f8328b6adf10b5506