pr-13345-60562c vs. 2412-270 / sw-lin-mesa / chibi-robo-zfighting

pr-13345-60562c (60562c9e) Diff 2412-270 (c770e7c2)
5c8c88191e94c7d8f82b14f3519902b50e0ae14f Waiting for diff... be661692257741b05b4e20452caf6c23c34cce21
1f5688d3bde68dc9f50562cdecd8c041464e8e9b Waiting for diff... c57a5f2482cfcbed2ecd96397a77e251c14be34b
b0ba4d42a9d0e4713a9f4627558eb87b3e7e6227 Waiting for diff... 53f8000b89a3cb6ca333708b7f2bdc2c4522f2cc