Convert LazyServiceRegistrar usage to singleton am: caed24ba9b am: 05d36f94c2
am: 69f9aa86f0

Change-Id: I58d8d2381898767377cf184379c6c94b50ce9fdf