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

Change-Id: If9bb8c58073afb943ef1b98324141513bbd6fef6