pr-13222-08f6f1 vs. 2412-31 / vk-lin-mesa / jj-awae-mirrored

pr-13222-08f6f1 (08f6f1d4) Diff 2412-31 (ada646a7)
Failure 174ba8cd5a57ef1dbe26fc72f80dde0191b617e8
Failure 9ab1ffee08656a278f1c26a28b04b3ebeec386f2
Failure 1bde1224dc122733c412d6e98a00f2167ebd67a2