Merge "Bring multi-channel transport into the glorious new age"
am: a15a9bbadf

Change-Id: Iec27272215b8e11041c221ad9d338e8011052ae3