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