am 0f92dde3: am ae7b22d6: Merge "Fix issue #10901205: Shouldn\'t send broadcasts (or try to bind services, etc.)..." into klp-dev

* commit '0f92dde36f1f68c246e49943445676ce21a339c8':
  Fix issue #10901205: Shouldn't send broadcasts (or try to bind services, etc.)...