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

Change-Id: I791d55bcf0a5044cf19c8cb80bfb622a548fc554