Merge "servicemanager: use safer ref base semantics"