Merge "servicemanager_test on host"