pr-9718-8e4688 vs. 5.0-14706 / sw-lin-mesa / chibi-robo-zfighting

pr-9718-8e4688 (8e468820) Diff 5.0-14706 (d1beb9ef)
aecc32aa85ecf4daeb5d3f6a9238e2247c7464ca Waiting for diff... aecc32aa85ecf4daeb5d3f6a9238e2247c7464ca
cb249db2bc8aafae2a3466870d9cce904f81846f Waiting for diff... 9536ea725fffb843c70badf2e96a41d5a89ef7ad
c43a60939b3629d2488c41e66c7a7d171d54f1a6 Waiting for diff... aa9aade831d9c317f62a547a7669971cf5343aba