Convert LazyServiceRegistrar usage to singleton
am: caed24ba9b

Change-Id: Id1a200b248b30209e8481a617bdfccefc5080134