Add multichannel support am: c678d51bdc am: 9886d749d4
am: b0da0bce66

Change-Id: I2b701daf2c12a7b0454c46d48910671f10ccb2b6