Merge "Convert LazyServiceRegistrar usage to singleton" am: f71728f04b am: 0c7812c7f5
am: 4ddbdbca8b

Change-Id: I9f3b2f6d1e035158244d09eb3b7f669c510259a1