Signed-off-by: Sian Lerk Lau <kiawin@gmail.com> Upstream-commit: bc3e02b9ec4702981bbbd337e4f6ca12bf4eb202 Component: engine