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

Change-Id: I1023612e349b576fed331cb6285de13ae58d0304