Fix bad rebase where bridgeiface was removed Upstream-commit: 2a1609d618fc89cd76affe163db4b8dab153ec40 Component: engine