pr-12716-14ae23 vs. 5.0-21453 / sw-lin-mesa / chibi-robo-zfighting

pr-12716-14ae23 (14ae2341) Diff 5.0-21453 (e69486d2)
Failure be661692257741b05b4e20452caf6c23c34cce21
Failure c57a5f2482cfcbed2ecd96397a77e251c14be34b
Failure 53f8000b89a3cb6ca333708b7f2bdc2c4522f2cc