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

Change-Id: I109284a897eba18ec57bd5f61cdade0fcde19a36