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

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