Merge tag 'mesa-22.2.5'

Bug: 120581
Change-Id: I129287cbdde8fcf84cde462bac5d235911b5d7db