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

Change-Id: Id665b84417e0e66b0c89567b5489ad66b884eaaf