The goal of this change is to make it more clear which messages are
supposed to be on which channels.  A subsequent change will make the
devhost code more clear.

Change-Id: I8816f18dc5ccd40bb3a8a5e7a000131b37e7f0ca