Signed-off-by: Eric Sage <eric.david.sage@gmail.com> Upstream-commit: 4466d005345c9560eec4261990c6d042d06bf372 Component: engine