Vendor engine-api with client context changes. Upstream-commit: da58ee42bb1d4e17c5b525d161f29ad8efc0569e Component: engine