Add multichannel support am: c678d51bdc am: 5de1ae23f9 am: e0c3d0c3fd am: 006436f92f am: 375ea55d58
am: dd76af0823

Change-Id: I107007cd751f9d9cd28d108f681b2159d3810c5b