Signed-off-by: Emil Velikov <emil.velikov@collabora.com> (cherry picked from commit c9e993ba13)
c9e993ba13