Merge "LazyServiceRegistrar: Use defaultServiceManager" am: 7f9edd9bff am: 3e7c0f4069

Change-Id: Ic4c6c4dafa18fa04091a538559211474e0560643