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

Change-Id: Ib683c063184299c4d6dfab564324da867ac2fd46