Signed-off-by: Andres Gomez <agomez@igalia.com> (cherry picked from commit 96ad27f8fcf3979c577c052f725e2a80035295aa)
Signed-off-by: Andres Gomez <agomez@igalia.com> (cherry picked from commit ae52410bf08aa9c054651258f2fd0d0a2c9c5241)