Merge \\\"Handling of Fuji Xerox in RecommendationService.\\\" into nyc-dev am: 5398f273 am: 0273d5d4 am: 00c3ada2 Change-Id: I6c92e7dc6ec2b279373f8b5dbcdebb9a11f8d9ce