Merge "Merge "Move Xerox recommendation plugin to service." into nyc-dev am: e509dcb43f am: e498e847c8" into nyc-mr1-dev-plus-aosp
am: 63ef4a9a07

* commit '63ef4a9a07798709c43d93864bfb26c2a1186f73':

Change-Id: I0d5381cbe93c7a5ae8f3412a14224449ae95347d