Convert LazyServiceRegistrar usage to singleton am: e1de3d1ab2
am: b84f0142d5

Change-Id: I2f0b20d5deb1d9c8ed359f4e8612265a23e1f216