Merge "servicemanager: fix lazy service issues"