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

Change-Id: I79888e8b145c93eae9bea9c7e6f2c59e3912c29f