am 0259c010: am 596e409e: Merge "Work on issue #11634365: Leaking restarting services" into klp-dev

* commit '0259c010221c73db11ee52b4b0758a179e5c0db1':
  Work on issue #11634365: Leaking restarting services