pr-13222-08f6f1 vs. 2412-31 / vk-lin-mesa / soa-black

pr-13222-08f6f1 (08f6f1d4) Diff 2412-31 (ada646a7)
Failure fa68235fafdedcc22881e12848719a74c85ce021
Failure 96d6ec2dda59d063db6993492f38a5b75228c547
Failure fc2218ec869ee210cc3b50e483c4fe5e23641a23