pr-13111-a1a43d vs. 2409-115 / mtl-osx-m1 / chibi-robo-zfighting

pr-13111-a1a43d (a1a43d7d) Diff 2409-115 (7db13d23)
Failure ddded172d668353741b8503f89b0644853396dcc
Failure 92e7fa721d497114cba626959f2ff03fe36d7393
Failure 1988eaa52653316eb5acfc8bf9efa1cdded14139