Convert LazyServiceRegistrar usage to singleton am: e1de3d1ab2 am: b84f0142d5 am: e7330ce72c
am: 25259b25f3

Change-Id: I872f5ba05446a1c591aff62a1dbe2b38d0407acd