What is the reason we make the bridge `ServiceLocatorAware`? I can't find a change that supports this?