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

Change-Id: I576ff0dc11efefa6671d20e867ab2cb6eea477f6