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

Change-Id: If8fcb23a4166972d0a6c7e7fba6addf92d05e01e