Bug: https://baylibre.atlassian.net/browse/JUN-25


Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>