Vendor distribution changes. Upstream-commit: 5b6063c83701d962325e16bec15a0cecb154e15d Component: engine