pr-13367-80ff0d vs. pr-13350-c7afc4 / vk-lin-mesa / chibi-robo-zfighting

pr-13367-80ff0d (80ff0dd1) Diff pr-13350-c7afc4 (c7afc42c)
9376da6012fccb6cee8b6ab4e485ae9ad0d1a3b6 Waiting for diff... 8161c626de54b1b9d87e098bda107c174034cb59
2d3e5ed6af98a2e821383bdbb41ec8b9e280afd5 Waiting for diff... a9eb21c8a4735e8613470ab09e64fc67ef1c4dff
30b9cf18171dd28faaf7a73a39b570ef348c2cfb Waiting for diff... d02bbf53da80667e3c532931fef5cb5e9e3a3224