pr-13222-08f6f1 vs. 2412-31 / vk-lin-mesa / chibi-robo-zfighting

pr-13222-08f6f1 (08f6f1d4) Diff 2412-31 (ada646a7)
Failure 9376da6012fccb6cee8b6ab4e485ae9ad0d1a3b6
Failure 2d3e5ed6af98a2e821383bdbb41ec8b9e280afd5
Failure 30b9cf18171dd28faaf7a73a39b570ef348c2cfb