5.0-9320 vs. 5.0-8825 / sw-lin-mesa / chibi-robo-zfighting

5.0-9320 (d3e1d2ea) Diff 5.0-8825 (74fd95c4)
Failure 5b470111febf41a69ca1e7034f71e522a0e207a4
Failure f515bf424018c6d6f86f10a3feb784080ac68944
Failure f515bf424018c6d6f86f10a3feb784080ac68944
Failure b827acad3bf48d983ff9f5a36f0cea9b973198cf