Convert LazyServiceRegistrar usage to singleton
am: e1de3d1ab2

Change-Id: I2875717a6e7473feec0902a68b241f09b2d88e29