Merge "Revert "servicemanager: fix lazy service issues""