pr-13222-08f6f1 vs. 2412-31 / vk-lin-mesa / jd2-fmv

pr-13222-08f6f1 (08f6f1d4) Diff 2412-31 (ada646a7)
Failure e7e7231b70e4d394d4a75bd404b34a05a26b363b
Failure c392eb1b0dcc54071022179462f7d2ded2fe4d37
Failure a0f073cd274167d4f150a3a5eadd7db3948511c3