Originally merged in #26061. Signed-off-by: David Sheets <sheets@alum.mit.edu> Upstream-commit: a003419fca2c4ce7ed53edc8da67a22748aa4a23 Component: engine