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