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

Change-Id: I761476877343bf16816298c2a75ee386e6ba83a2