am 51843f8a: am 371c46fe: Merge "Remove exceptions from the printer discovery session APIs." into klp-dev

* commit '51843f8aa9a76207627288252a99f12141195a07':