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