Change-Id: Iede314c1a93b91bf14f0f8b9b8135f88a44e130c Co-Authored-By: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>