Merge "Refinement of the print service APIs." into klp-dev