Signed-off-by: Michael Hudson-Doyle <michael.hudson@linaro.org> Upstream-commit: 3e10b93106dea94e5747ab32fe4ac765aa22f9bc Component: engine