This is a follow up of #35168. Signed-off-by: Yuichiro Kaneko <spiketeika@gmail.com> Upstream-commit: 7b3966245de27b753c6acfe0347833811ed9eed8 Component: engine