am 03be79b3: am fbf4888d: am 9882d388: Merge "Fix issue #11223338: Not retaining service started state while restarting" into klp-dev

* commit '03be79b35ca7060f383075a43ff19c8a9d63a7c0':
  Fix issue #11223338: Not retaining service started state while restarting