Merge "Convert LazyServiceRegistrar usage to singleton"