Signed-off-by: Andres Gomez <agomez@igalia.com> (cherry picked from commit 3281775ab9993d700a0a01a2823b6e7c72fce150)
Signed-off-by: Andres Gomez <agomez@igalia.com> (cherry picked from commit 3482790712e92d660706952f9ff282d904415941)