Merge "service_manager: duplicate registrations override previous ones"