Add multichannel support am: c678d51bdc am: 9886d749d4 am: b0da0bce66 am: 5ed6bca916
am: 86e4c2cfd8

Change-Id: I8eb5a776aa7a08a2eac5466f12ffc844f0b649db