am ee6556ab: (-s ours) am e1c2dfee: am c7c4d6dd: Merge "Refinement of the print service APIs." into klp-dev

* commit 'ee6556abc93f40955a745b0d2c3329d731c360b4':