Signed-off-by: Ben Taylor <ben.taylor@linaro.org> (cherry picked from commit 5b4be7edaffe86553b4875f80c78c3befe4ae618)