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