Cherry-pick #24325 to master Upstream-commit: 4f44ea315418808e5e68dd16879b3a4bd8c339a3 Component: engine