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

Change-Id: I0e6762676a66e4fd1ffbb703bf04bc482a460414