am d454beb8: am 0d38d0b4: Merge "Multiple printer discovery session instances...
am d454beb8: am 0d38d0b4: Merge "Multiple printer discovery session instances and other bugs." into klp-dev
* commit 'd454beb8':
Multiple printer discovery session instances and other bugs.