Merge "Add getInstance call to LazyServiceRegistrar"
am: 2a5beb5fb8

Change-Id: Idca1c4da804314af969d2435d55c373af13a6af0