am 801fd360: am fcc42e8f: Merge "Fix issue #17661444: Persistent service not automatically restarted" into lmp-dev

* commit '801fd36026b3f355fde91e30c7698a5ff71a5569':
  Fix issue #17661444: Persistent service not automatically restarted