am efcc2ca6: Merge "Fix issue #11223338: Not retaining service started state while restarting" into klp-dev

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