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

Change-Id: I9a1007e5ea6e96e904d9c0972ba2a5be0308f538