Merge "Fix package name of canon and xerox." into nyc-dev