pr-13222-08f6f1 vs. 2412-31 / ogl-lin-mesa / sf-assault-flashing

pr-13222-08f6f1 (08f6f1d4) Diff 2412-31 (ada646a7)
Failure d37d108a3c50d5572364c060f3da255a2cb9939c
Failure 816f74b5aa33488c2b9fcfbdab7099afa36d85f8
Failure 8c9f47ae6c763916deca56f75ceb88aef32995dd