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

Change-Id: I1bbce71248b4005433b5cc7351bc8fbce426325e