Part of https://projects.linaro.org/browse/LAVA-491 Change-Id: I38d572050d66ed2f00416af2b101861077460046