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

Change-Id: Ic4983a30ac00e0d1f9beb737e917963678a57782