Add multichannel support am: c678d51bdc am: 5de1ae23f9
am: e0c3d0c3fd

Change-Id: Ieca398bea38f13621185a192d09733243febe131