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

Change-Id: I6aeba2a72185c08a15dc96468bfe6c4c45410d52