Merge "LazyServiceRegistrar: Use defaultServiceManager"