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

Change-Id: Ie9527d8e194ac040dc3b2305097145fe3b9548be